logstash-output-nsq 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1181fa99eaf3d901a8105443850f7f8fdb84598
-  data.tar.gz: 6013ca1afc554012fe8ea85b6bb15e9d4ee620c1
+  metadata.gz: 935351cd974419b603229a1fc1f85470dd0c5e58
+  data.tar.gz: a8a2495d3589e5f5e7a0d59cfa8762d5cb432678
 SHA512:
-  metadata.gz: ce2121499a39d4483c8898f64465aaf3ddfef373422466e9f81f8cf9d29aa00e2e1aded110db5b3985f839ca4c814bc163f7b7d2586227b46f12fc5a3d23b561
-  data.tar.gz: ad1aee4bf575a89637f74aa6242455da091435164496649e8f91f2c492137060262782c9fb2d7867b05b554ebfa1af95708a0e561ea6e227feb6c2d586bfeda4
+  metadata.gz: ef92fb170e99c2d2eaa9bce9e7e3235dd0d95d2c019dcfbb8a6d372aa1d1d2ae007e2822b8a6e1bb3db95db35b8729ef8da981575d172aa1f5ee03275e02a2ee
+  data.tar.gz: 0d7b0484df89569fc6db8e384b165b4e59080674ab5814664f33b962fa39010f1e07176383bfeb1d15cf5a872164a6f14553f148345524db023a125206de0118

data/lib/logstash/outputs/nsq.rb

@@ -1,14 +1,12 @@
 require 'logstash/namespace'
 require 'logstash/outputs/base'
-require 'java'
+require 'nsq'
 
 class LogStash::Outputs::Nsq < LogStash::Outputs::Base
-    declare_threadsafe!
     config_name 'nsq'
 
     default :codec, 'json'
 
-    default :codec, 'json'
     config :nsqd, :validate => :string, :default => nil
     config :nsqlookupd, :validate => :array, :default => nil
     config :topic, :validate => :string, :required => true
@@ -18,9 +16,6 @@ class LogStash::Outputs::Nsq < LogStash::Outputs::Base
  
   public
   def register
-    @thread_batch_map = Concurrent::Hash.new
-
-    require 'nsq'
     options = {
         :nsqlookupd => @nsqlookupd,
         :topic => @topic,
@@ -62,41 +57,15 @@ class LogStash::Outputs::Nsq < LogStash::Outputs::Base
 
     @producer = Nsq::Producer.new(options)
     @logger.info('Registering nsq producer', :nsqd => @nsqd, :nsqlookupd => @nsqlookupd, :topic => @topic)
-    @codec.on_event do |event, data|
-        write_to_nsq(event, data)
-    end
   end # def register
 
-  def write_to_nsq(event, data)
-    begin
-      @producer.write(event.sprintf(data))
-    rescue LogStash::ShutdownSignal
-      @logger.info('nsq producer got shutdown signal')
-    rescue => e
-      @logger.warn('nsq producer threw exception, restarting', :exception => e)
-    end # begin
+  def write_to_nsq(payload)
+    @producer.write(payload)
   end # def send_to_nsq
 
-  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
-
-    batch = @thread_batch_map[t]
-    if batch.any?
-      retrying_send(batch)
-      batch.clear
+  def multi_receive_encoded(encoded)
+    encoded.each do |event,data|
+      write_to_nsq(data)
     end
   end
 

data/logstash-output-nsq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-nsq'
-  s.version         = "1.0.10"
+  s.version         = "1.0.11"
   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,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nsq
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Matthias Schneider
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +20,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
-  name: logstash-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,48 +31,50 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 8.0.0
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: nsq-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-  name: nsq-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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
+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
 email: ms@wck.biz
 executables: []
 extensions: []
@@ -95,7 +97,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -110,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: this logstash plugin outputs in a nsq topic
 test_files: