logstash-input-tcp 6.0.1-java → 6.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b302df6e39b800aa93dc56ddeff90534f404c8e322a7d6ac5f359123e964dc3a
-  data.tar.gz: 77db42b004f85076fc336424b8fe30c10ac107c6e4a90ce68e7ffee63159651b
+  metadata.gz: f82b021e38562b73fd86db67622bf4e701c318877db99e2975c439bbbfcbc9f0
+  data.tar.gz: 45be9692924611030546fc05ef18046ffca0e4430fb6b5647cf5255948f89895
 SHA512:
-  metadata.gz: e531556d356c2037e23168faf0848b05ea4a7760e60a04be9a045a69d0cce07b5edb0ea7a84314bd47cad55f050bee5ffcf8e6d186c12796efce1db9cf86e112
-  data.tar.gz: 91b06eee36084aa9de3e7bfd71920d6e0c77085d26e2cc51df7abeec208f540e17c08c06a220b20efe0d6f7b4eaeed4426aee192f1c9d62ebad7d8d61deb00b0
+  metadata.gz: c2a1aac5ed786a53c841e440f9aab3d2132e1979284302d30bc1b16c206eb3716a940709e189d9b9fd276dcf6bda4661f4969822f1a5a8c089447819070dd46f
+  data.tar.gz: e3ffa0f369214f727bc3dc2202e5d8ff1eaf379a6c8aff2df0a652a616dae723c483a4042294a52d2c8f80412a1c62101ba3049dfcdde01fc54448d8809e7c1f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.2
+  - Fixed race condition where data would be accepted before queue was configured
+
 ## 6.0.1
   - Support multiple certificates per file [#140](https://github.com/logstash-plugins/logstash-input-tcp/pull/140)
 

data/lib/logstash/inputs/tcp.rb

@@ -137,11 +137,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def register
     fix_streaming_codecs
 
-    # note that since we are opening a socket in register, we must also make sure we close it
-    # in the close method even if we also close it in the stop method since we could have
-    # a situation where register is called but not run & stop.
-
-    @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
     if server?
       ssl_context = get_ssl_context(SslOptions)
 
@@ -153,6 +148,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def run(output_queue)
     @output_queue = output_queue
     if server?
+      @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
       @loop.run
     else
       run_client()

data/spec/inputs/tcp_spec.rb

@@ -399,12 +399,7 @@ describe LogStash::Inputs::Tcp do
           chain_of_certificates = TcpHelpers.new.chain_of_certificates
 
           let(:tcp) do
-            begin
-              socket = TCPSocket.new("127.0.0.1", port)
-            rescue Errno::ECONNREFUSED
-              sleep 1
-              socket = TCPSocket.new("127.0.0.1", port)
-            end
+            Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
           end
           let(:sslcontext) do
             sslcontext = OpenSSL::SSL::SSLContext.new
@@ -502,14 +497,8 @@ describe LogStash::Inputs::Tcp do
 
           context "that disconnects before doing TLS handshake" do
             before do
-              begin
-                client = TCPSocket.new("127.0.0.1", port)
-                client.close
-              rescue Errno::ECONNREFUSED
-                sleep 1
-                client = TCPSocket.new("127.0.0.1", port)
-                client.close
-              end
+              client = Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
+              client.close
             end
 
             it "should not negatively impact the plugin" do
@@ -540,7 +529,7 @@ describe LogStash::Inputs::Tcp do
               # Assertion to verify this test is actually sending something.
               expect(garbage.length).to be > 0
 
-              client = TCPSocket.new("127.0.0.1", port)
+              client = Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
               client.write(garbage)
               client.flush
               Thread.new { sleep(1); client.close }

data/version

@@ -1 +1 @@
-6.0.1
+6.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ files:
 - logstash-input-tcp.gemspec
 - spec/inputs/tcp_spec.rb
 - spec/spec_helper.rb
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.1/logstash-input-tcp-6.0.1.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.2/logstash-input-tcp-6.0.2.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: