logstash-input-syslog 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa7bffcee872ad4acc31204befd27fe1dfaf8b7ed7e2ea1f9c5f83cd1e90d55
-  data.tar.gz: '08e2261511e7ebaac9406c438680e37894b9ed97bc8219f957dc6c5cc31e66e5'
+  metadata.gz: a308c5702d6887cf5bf7842fdd4b3cd37d8b3591bb9abf84914473b5711ffffd
+  data.tar.gz: bda506472180eed7313a59b0927b589658ac3344484cfef7b245bbb463a92611
 SHA512:
-  metadata.gz: bce1f222438c07c3f56691febb451a578e59861e36ba980bc81656ba4390f36bb820c6f945bc803317b9f35ca557377f9eb2a8e5102e63597030fb522d6ababb
-  data.tar.gz: 7fb0770942f47b8819887bae185bba673e8390ae30bbdc8622913c0d7efaada310226e580de0cd109ec24ad1a51d5a2a064c395fa8e1d3de7393ce2f0d456ad9
+  metadata.gz: 86baef4a8e94743bb2523eede569072947d26cddede101162c72b1ee17ed74be9aef62232f4a4d2f0a7b2b4adbe3134051abf6ba91c5b17d2ea7125d255da0be
+  data.tar.gz: 5073d8e96af959e9d71cda4d77e11a2224249733c95386cf818277ed35e6a19b56c43bf33f5efee7039bcab64db771204d5da5b83c9d887d7d589273f0a7b642

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.4
+  - Fix issue where stopping a pipeline (e.g., while reloading configuration) with active inbound syslog connections could cause Logstash to crash
+
 ## 3.2.3
   - Update gemspec summary
 

data/lib/logstash/inputs/syslog.rb

@@ -199,9 +199,17 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
     end
   rescue Errno::ECONNRESET
     # swallow connection reset exceptions to avoid bubling up the tcp_listener & server
+    logger.info("connection reset", :client => "#{ip}:#{port}")
+  rescue Errno::EBADF
+    # swallow connection closed exceptions to avoid bubling up the tcp_listener & server
+    logger.info("connection closed", :client => "#{ip}:#{port}")
+  rescue IOError => ioerror
+    # swallow connection closed exceptions to avoid bubling up the tcp_listener & server
+    raise unless socket.closed? && ioerror.message.include?("closed")
+    logger.info("connection error: #{ioerror.message}")
   ensure
     @tcp_sockets.delete(socket)
-    socket.close rescue nil
+    socket.close rescue log_and_squash
   end
 
   private
@@ -228,19 +236,36 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
   private
   def close_udp
     if @udp
-      @udp.close_read rescue nil
-      @udp.close_write rescue nil
+      @udp.close_read rescue log_and_squash
+      @udp.close_write rescue log_and_squash
     end
     @udp = nil
   end
 
   private
+
+  # Helper for inline rescues, which logs the squashed exception at "TRACE" level
+  # and returns nil.
+  #
+  # Instead of:
+  # ~~~ ruby
+  #.  foo rescue nil
+  # ~~~
+  # Do:
+  # ~~~ ruby
+  #.  foo rescue log_and_squash
+  # ~~~
+  def log_and_squash
+    $! && logger.trace("SQUASHED EXCEPTION: `#{$!.message}` at (`#{caller.first}`)")
+    nil
+  end
+
   def close_tcp
     # If we somehow have this left open, close it.
     @tcp_sockets.each do |socket|
-      socket.close rescue nil
+      socket.close rescue log_and_squash
     end
-    @tcp.close if @tcp rescue nil
+    @tcp.close if @tcp rescue log_and_squash
     @tcp = nil
   end
 

data/logstash-input-syslog.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-syslog'
-  s.version         = '3.2.3'
+  s.version         = '3.2.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads syslog messages as events"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-syslog
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Reads syslog messages as events