logstash-output-nsq 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd25f8e6bdfb09bc086e9facb0c799d7cc7ef624
-  data.tar.gz: 3aa188a306b5f2f0a66661f817c383a8fc3720c0
+  metadata.gz: e1181fa99eaf3d901a8105443850f7f8fdb84598
+  data.tar.gz: 6013ca1afc554012fe8ea85b6bb15e9d4ee620c1
 SHA512:
-  metadata.gz: 76df418a92a14e0aef8d7ad40796bf8541c8ee3fcb3493ac4d403647b0981521a6f2a847e7683aa10cf9458c6a65eb22eff0a17c78e0b8d52d135d0e6e566ce3
-  data.tar.gz: 3762f904fc9b710b883d16586c961f67d73171333f1745696c4b4fe5b292863075a44abca245c764defcc6ead1bdcc5074e0d39bcc169c5f790a6c5a741f5710
+  metadata.gz: ce2121499a39d4483c8898f64465aaf3ddfef373422466e9f81f8cf9d29aa00e2e1aded110db5b3985f839ca4c814bc163f7b7d2586227b46f12fc5a3d23b561
+  data.tar.gz: ad1aee4bf575a89637f74aa6242455da091435164496649e8f91f2c492137060262782c9fb2d7867b05b554ebfa1af95708a0e561ea6e227feb6c2d586bfeda4

data/lib/logstash/outputs/nsq.rb

@@ -1,19 +1,25 @@
 require 'logstash/namespace'
 require 'logstash/outputs/base'
+require 'java'
 
 class LogStash::Outputs::Nsq < LogStash::Outputs::Base
-  config_name 'nsq'
+    declare_threadsafe!
+    config_name 'nsq'
 
-  default :codec, 'json'
-  config :nsqd, :validate => :string, :default => nil
-  config :nsqlookupd, :validate => :array, :default => nil
-  config :topic, :validate => :string, :required => true
-  config :tls_v1, :validate => :boolean, :default => false
-  config :tls_key, :validate => :string
-  config :tls_cert, :validate => :string
+    default :codec, 'json'
 
+    default :codec, 'json'
+    config :nsqd, :validate => :string, :default => nil
+    config :nsqlookupd, :validate => :array, :default => nil
+    config :topic, :validate => :string, :required => true
+    config :tls_v1, :validate => :boolean, :default => false
+    config :tls_key, :validate => :string
+    config :tls_cert, :validate => :string
+ 
   public
   def register
+    @thread_batch_map = Concurrent::Hash.new
+
     require 'nsq'
     options = {
         :nsqlookupd => @nsqlookupd,
@@ -53,11 +59,11 @@ class LogStash::Outputs::Nsq < LogStash::Outputs::Base
         }
       end
     end # if
+
     @producer = Nsq::Producer.new(options)
-    #@producer.connect
     @logger.info('Registering nsq producer', :nsqd => @nsqd, :nsqlookupd => @nsqlookupd, :topic => @topic)
     @codec.on_event do |event, data|
-       write_to_nsq(event, data)
+        write_to_nsq(event, data)
     end
   end # def register
 
@@ -71,17 +77,35 @@ class LogStash::Outputs::Nsq < LogStash::Outputs::Base
     end # begin
   end # def send_to_nsq
 
-  def receive(event)
-    return unless output?(event)
-    if event == LogStash::SHUTDOWN
-      finished
-      return
+  def prepare(record)
+    # This output is threadsafe, so we need to keep a batch per thread.
+    @thread_batch_map[Thread.current].add(record)
+  end
+
+  def multi_receive(events)
+    t = Thread.current
+    if !@thread_batch_map.include?(t)
+      @thread_batch_map[t] = java.util.ArrayList.new(events.size)
+    end
+
+    events.each do |event|
+      break if event == LogStash::SHUTDOWN
+      @codec.encode(event)
     end
-    @codec.encode(event)
-  end # def receive
+
+    batch = @thread_batch_map[t]
+    if batch.any?
+      retrying_send(batch)
+      batch.clear
+    end
+  end
 
   def close
     @logger.info('closing nsq producer')
     @producer.terminate
   end
+
+  private
+
 end #class LogStash::Outputs::Nsq
+

data/logstash-output-nsq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-nsq'
-  s.version         = "1.0.9"
+  s.version         = "1.0.10"
   s.licenses = ["Apache License (2.0)"]
   s.summary = "this logstash plugin outputs in 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nsq
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Matthias Schneider