Skip to content

Commit b93509a

Browse files
committed
Review feedbacks applied: adding doc to method, typing fix and simplify logic.
1 parent 73dcde9 commit b93509a

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

lib/logstash/outputs/tcp.rb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class LogStash::Outputs::Tcp < LogStash::Outputs::Base
5656

5757
class Client
5858

59+
##
60+
# @param socket [Socket]
61+
# @param logger_context [#log_warn&#log_error]
5962
def initialize(socket, logger_context)
6063
@socket = socket
6164
@logger_context = logger_context
@@ -142,8 +145,11 @@ def register
142145
@thread_no = Concurrent::AtomicFixnum.new(0)
143146
setup_ssl if @ssl_enable
144147

145-
run_as_server if server?
146-
run_as_client unless server?
148+
if server?
149+
run_as_server
150+
else
151+
run_as_client
152+
end
147153
end
148154

149155
def run_as_server
@@ -174,8 +180,7 @@ def run_as_server
174180
@logger.debug("accepted connection", client: client_socket.peer, server: "#{@host}:#{@port}")
175181
client = Client.new(client_socket, self)
176182
Thread.current[:client] = client
177-
@thread_no.increment
178-
LogStash::Util.set_thread_name("[#{pipeline_id}]|output|tcp|client_socket-#{@thread_no.value}")
183+
LogStash::Util.set_thread_name("[#{pipeline_id}]|output|tcp|client_socket-#{@thread_no.increment}")
179184
@client_threads << Thread.current
180185
client.run unless @closed.value
181186
end
@@ -196,9 +201,9 @@ def run_as_client
196201
begin
197202
client_socket = connect unless client_socket
198203

199-
writable_oi = nil
200-
while writable_oi.nil? || writable_oi.any? == false
201-
readable_io, writable_oi, _ = IO.select([client_socket],[client_socket])
204+
writable_io = nil
205+
while writable_io.nil? || writable_io.any? == false
206+
readable_io, writable_io, _ = IO.select([client_socket],[client_socket])
202207

203208
# don't expect any reads, but a readable socket might
204209
# mean the remote end closed, so read it and throw it away.

0 commit comments

Comments
 (0)