logstash-input-udp 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0105afa2ee725c47660577dbf22c2ad2f67be803379a6fd65dd0dfae7a2cafff
-  data.tar.gz: 6daebc814537c9219e9b993e97f0a55f2c0bbfb9769bc4ee09930614a3ffd96b
+  metadata.gz: 65ce03f6729a3d13216ee414e60c83e23aaf0ba9975ab9138339ccc0fcb2373e
+  data.tar.gz: 60b7a6b91ad030142164d5ce7b80208457735e93f26c70d8861eedf0f324a02e
 SHA512:
-  metadata.gz: 982fef22a015e83c177579134eecc8fb042af10fbe78652b465ad5298f04112855fce191a8818b6518c9dc0119e12bd1c468d8944dc7dcc9867f1ebc6f3943d8
-  data.tar.gz: c540241bc6cec7b34e0063f950967e58f9c241aebb83903aa389019497f9db40b133fa10cc2f309a449d180982bb811c073922c7e37f537e87421f53fddd4fa2
+  metadata.gz: 93a7f99e7e3a03c1370877a3f05599880d629581afcd08f47db6cd2416a30175fe791eab6d976e35d652ff96e13d44c85a18c031258657e059b5fb28f5f92de1
+  data.tar.gz: f78894b90992202b434fe29ba2131336e2c836cbff14025b30d61a4333fdfc9999a5184d53a5d865dba1c436422939d483214cacb7fc4a7986a8daaf9ebe9ca1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.1
+  - Code cleanup. See https://github.com/logstash-plugins/logstash-input-udp/pull/33
+
 ## 3.2.0
   - Clone codec per worker. See https://github.com/logstash-plugins/logstash-input-udp/pull/32
 

data/lib/logstash/inputs/udp.rb

@@ -39,20 +39,18 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
 
   HOST_FIELD = "host".freeze
 
-  public
   def initialize(params)
     super
     BasicSocket.do_not_reverse_lookup = true
-  end # def initialize
+  end
 
-  public
   def register
     @udp = nil
-  end # def register
+  end
 
-  public
   def run(output_queue)
-  @output_queue = output_queue
+    @output_queue = output_queue
+
     begin
       # udp server
       udp_listener(output_queue)
@@ -60,14 +58,27 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
       @logger.warn("UDP listener died", :exception => e, :backtrace => e.backtrace)
       Stud.stoppable_sleep(5) { stop? }
       retry unless stop?
-    end # begin
-  end # def run
+    end
+  end
+
+  def close
+    if @udp && !@udp.closed?
+      @udp.close rescue ignore_close_and_log($!)
+    end
+  end
+
+  def stop
+    if @udp && !@udp.closed?
+      @udp.close rescue ignore_close_and_log($!)
+    end
+  end
 
   private
+
   def udp_listener(output_queue)
     @logger.info("Starting UDP listener", :address => "#{@host}:#{@port}")
 
-    if @udp && ! @udp.closed?
+    if @udp && !@udp.closed?
       @udp.close
     end
 
@@ -94,7 +105,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     while !stop?
       next if IO.select([@udp], [], [], 0.5).nil?
       # collect datagram messages and add to inputworker queue
-      @queue_size.times {
+      @queue_size.times do
         begin
           payload, client = @udp.recvfrom_nonblock(@buffer_size)
           break if payload.empty?
@@ -102,17 +113,18 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
         rescue IO::EAGAINWaitReadable
           break
         end
-      }
+      end
     end
   ensure
     if @udp
-      @udp.close_read rescue nil
-      @udp.close_write rescue nil
+      @udp.close_read rescue ignore_close_and_log($!)
+      @udp.close_write rescue ignore_close_and_log($!)
     end
-  end # def udp_listener
+  end
 
   def inputworker(number, codec)
     LogStash::Util::set_thread_name("<udp.#{number}")
+
     begin
       while true
         payload, client = @input_to_worker.pop
@@ -124,24 +136,15 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     rescue => e
       @logger.error("Exception in inputworker", "exception" => e, "backtrace" => e.backtrace)
     end
-  end # def inputworker
-
-  public
-  def close
-    @udp.close rescue nil
   end
 
-  public
-  def stop
-    @udp.close rescue nil
-  end
-
-  private
-
   def push_decoded_event(host, event)
     decorate(event)
     event.set(HOST_FIELD, host) if event.get(HOST_FIELD).nil?
     @output_queue.push(event)
   end
 
-end # class LogStash::Inputs::Udp
+  def ignore_close_and_log(e)
+    @logger.debug("ignoring close exception", "exception" => e)
+  end
+end

data/logstash-input-udp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-udp'
-  s.version         = '3.2.0'
+  s.version         = '3.2.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads events over UDP"
   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-udp
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement