logstash-input-tcp 5.0.8-java → 5.0.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172449656b3d799f06360eac0c9de9b64f255db7fe9484ef5a1baa59d88981f8
-  data.tar.gz: 8bae19a3515d41e732c55ae26b91018b08590ac215555b099567d744f3243f75
+  metadata.gz: 61f75f397819fe7ec52ebe3f7001294b1f9347e116d84ab9136ceb71b9f43694
+  data.tar.gz: 8bbf42e0358a82d6fe8cc05c9c87ad7335866a17f7bec046c414b5899cedb06e
 SHA512:
-  metadata.gz: 45357603663371f78c8a4962ef9e62aaa8168253a3d41a25948bb7a36ce3a6608fbe87f7d3440b6964d7bac58700ae85bc1c3280ecc113300c7bad543c654d41
-  data.tar.gz: a9e91dd3fe3587922c7d134dd00309ae5ea89c95c38cfc2c144c2accb446afa9bc950b194a8d859c3c832885a725605fda5ccd38f48649b0b9a3246d77e0cb8b
+  metadata.gz: 47e0697536fa5ac5a9bb4b8c0ee218d6d99a79fd0a24141a5f0b8c91e72a88d2e1d5c31153cd3b563e1b1e7fc0759f9da9e109ff6cd2453f98f0e3fd68b05866
+  data.tar.gz: d7bd3f0f555f4182753dfa7dbb7d6663b5623c8f10fdff00464a732d9551b0ed89abe7d26f532baaf91f3e94041887e1ea291f8753517113062cfb89c72bd4b7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.0.9
+  - New configuration option to set TCP keep-alive [#16](https://github.com/logstash-plugins/logstash-input-tcp/pull/116)
+  
 ## 5.0.8
   - Reorder shut down of the two event loops to prevent RejectedExecutionException
 

data/docs/index.asciidoc

@@ -88,6 +88,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-ssl_key>> |a valid filesystem path|No
 | <<plugins-{type}s-{plugin}-ssl_key_passphrase>> |<<password,password>>|No
 | <<plugins-{type}s-{plugin}-ssl_verify>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-tcp_keep_alive>> |<<boolean,boolean>>|No
 |=======================================================================
 
 Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -182,6 +183,13 @@ SSL key passphrase
 Verify the identity of the other end of the SSL connection against the CA.
 For input, sets the field `sslsubject` to that of the client certificate.
 
+[id="plugins-{type}s-{plugin}-tcp_keep_alive"]
+===== `tcp_keep_alive`
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `false`
+
+Instruct the socket to use TCP keep alives. Uses OS defaults for keep alive settings.
 
 
 [id="plugins-{type}s-{plugin}-common-options"]

data/lib/logstash/inputs/tcp.rb

@@ -105,6 +105,9 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   # Useful when the CA chain is not necessary in the system store.
   config :ssl_extra_chain_certs, :validate => :array, :default => []
 
+  # Instruct the socket to use TCP keep alives. Uses OS defaults for keep alive settings.
+  config :tcp_keep_alive, :validate => :boolean, :default => false
+
   HOST_FIELD = "host".freeze
   HOST_IP_FIELD = "[@metadata][ip_address]".freeze
   PORT_FIELD = "port".freeze
@@ -140,7 +143,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
       if @ssl_enable
         self.server_socket = new_server_socket
       else
-        @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self))
+        @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive)
       end
     end
   end
@@ -331,19 +334,26 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def new_server_socket
     begin
       socket = TCPServer.new(@host, @port)
+      socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, @tcp_keep_alive)
     rescue Errno::EADDRINUSE
       @logger.error("Could not start TCP server: Address in use", :host => @host, :port => @port)
       raise
     end
 
-    @ssl_enable ? OpenSSL::SSL::SSLServer.new(socket, ssl_context) : socket
+    if @ssl_enable
+      socket = OpenSSL::SSL::SSLServer.new(socket, ssl_context)
+      socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, @tcp_keep_alive)
+    end
+    socket
   end
 
   def new_client_socket
     socket = TCPSocket.new(@host, @port)
+    socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, @tcp_keep_alive)
 
     if @ssl_enable
       socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
+      socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, @tcp_keep_alive)
       socket.connect
     end
 

data/version

@@ -1 +1 @@
-5.0.8
+5.0.9

metadata

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