logstash-input-nsq 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d605a117955f070af8fe4078609337e7477450fa
-  data.tar.gz: 7f6bfdba6a84b2f0b9f35994ab1dca0954ad595c
+  metadata.gz: 4bcdd26b956b28a856e1ed8e211f7cc423adda09
+  data.tar.gz: 9e5ae986b664e3e905f188d1b4a93b451cd52387
 SHA512:
-  metadata.gz: c6600d9cb9aa17fe98e465ce35eb480b73947f9b767412ce5cb591cae7bbba34404c53a596cbdc2d97cf7bb2527c667c70856eae17bba71ce43e75e949ef7f44
-  data.tar.gz: f7f5662a4b19f783cafc940fc882634080d05cc883b698e1bf34fd55d9337efe748411931733f5280e2448753cdf7960e489fe8703bda3b9163c98def5a47934
+  metadata.gz: 2ec2f8811ce479d180a3be6a79509f9de06dd2dc76f974fda0669abba2029216d88324b828330a7217807b35322bc9dfbab3ab34b1e9dc0968941c221b502ad4
+  data.tar.gz: e24f7f6d45a160636b9fd9cbc95c0d857d1797b718b90fc365d8eb595219cd2d8cd2d2ae955f91a4f69f4a7ed4323ae3dc0e4a273e9d838ce53dee511256df2f

data/lib/logstash/inputs/nsq.rb

@@ -17,65 +17,62 @@ class LogStash::Inputs::Nsq < LogStash::Inputs::Base
 
   public
   def register
-   @logger.info('Registering nsq', :channel => @channel, :topic => @topic, :nsqlookupd => @nsqlookupd)
+    @logger.info('Registering nsq', :channel => @channel, :topic => @topic, :nsqlookupd => @nsqlookupd)
+    if @tls_key and @tls_cert
+      @consumer = Nsq::Consumer.new(
+       :nsqlookupd => @nsqlookupd,
+       :topic => @topic,
+       :channel => @channel,
+       :max_in_flight => @max_in_flight,
+       :tls_v1 => @tls_v1,
+       :tls_context => {
+        key: @tls_key,
+        certificate: @tls_cert
+       }
+      )
+    else
+      @consumer = Nsq::Consumer.new(
+       :nsqlookupd => @nsqlookupd,
+       :topic => @topic,
+       :channel => @channel,
+       :tls_v1 => @tls_v1,
+       :max_in_flight => @max_in_flight
+      )
+    end
   end # def register
 
   public
   def run(logstash_queue)
     @logger.info('Running nsq', :channel => @channel, :topic => @topic, :nsqlookupd => @nsqlookupd)
     begin
-      begin
-	if @tls_key and @tls_cert
-	  consumer = Nsq::Consumer.new(
-	   :nsqlookupd => @nsqlookupd,
-	   :topic => @topic,
-	   :channel => @channel,
-	   :max_in_flight => @max_in_flight,
-	   :tls_v1 => @tls_v1,
-	   :tls_context => {
-	    key: @tls_key,
-	    certificate: @tls_cert
-	   }
-	  )
- 	else
-          consumer = Nsq::Consumer.new(
-           :nsqlookupd => @nsqlookupd,
-           :topic => @topic,
-           :channel => @channel,
-	   :tls_v1 => @tls_v1,
-           :max_in_flight => @max_in_flight
-          )
-	end
-        while true
+       while !stop?
           #@logger.info('consuming...')
-          event = consumer.pop
+          event = @consumer.pop
           #@logger.info('processing:', :event => event)
           queue_event(event.body, logstash_queue)
-	  event.finish
-        end
-      rescue LogStash::ShutdownSignal
-        @logger.info('nsq got shutdown signal')
-      end
-      @logger.info('Done running nsq input')
-    rescue => e
-      @logger.warn('client threw exception, restarting',
-                   :exception => e)
-      retry
+	      event.finish
+       end
+       @logger.warn('Done running nsq input')
     end
-    finished
   end # def run
 
   private
   def queue_event(body, output_queue)
     begin
         #@logger.info('processing:', :body => body)
-	event = LogStash::Event.new("message" => body)  
-	decorate(event)
-	output_queue << event
-    rescue => e # parse or event creation error
-      @logger.error('Failed to create event', :message => "#{body}", :exception => e,
+	    event = LogStash::Event.new("message" => body)  
+	    decorate(event)
+    	output_queue << event
+        rescue => e # parse or event creation error
+           @logger.error('Failed to create event', :message => "#{body}", :exception => e,
                     :backtrace => e.backtrace)
     end # begin
   end # def queue_event
 
+  public
+  def stop
+    @logger.warn('nsq got stop signal. terminate')
+    @consumer.terminate
+  end #stop
+
 end #class LogStash::Inputs::Nsq

data/logstash-input-nsq.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-nsq
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Matthias Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core