logstash-input-zeromq 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99f5a681d8837c6a4a11d81daaf4767250b5b70
-  data.tar.gz: 71826bec5786729dcec1c093b8576800bcbb0c4d
+  metadata.gz: eb5f758f8a4c7f6dcb7a17badb293e3d7ee27e16
+  data.tar.gz: 725744c65f7c409b55d69c494b5845fe38ee55b5
 SHA512:
-  metadata.gz: af8694c4764f3e0d6cc76215601c9961bd48f9094d029de2849fcdbd953e7dd585a26a5665defffc6aa7484c35ebb3bc84b57acf462acda0dbe5f4625c7e82ac
-  data.tar.gz: e5770e9729ec51ab0c392961a5a3d7b75e25588af3bf2b097ebf7c3653b67815a7efb44976a766cd4fa98f607eadf4a96ae0c6409e6a2e32bb66ac9a7bf70067
+  metadata.gz: a78835c6d0c46c02444b9fd84c1d88be967058369b50f20a7cddd1f4d5a09db06c13e3ea19d70fac9494ca8afadabb9e921325fbf03fa278e1b669f87ec66e85
+  data.tar.gz: c33dd827a9c5e2f7e33c64323454d0f39a294aeb4b2baf39f8a1c3e02ce021c6d6c91cf92634fc5554efe1cbe3692beb6d01a217813d3cbcc11e4ad7ea04d622

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+# 1.1.0
+  - Add basic test to the project

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/zeromq.rb

@@ -113,9 +113,10 @@ class LogStash::Inputs::ZeroMQ < LogStash::Inputs::Base
 
   end # def register
 
-  def teardown
+  def close
     error_check(@zsocket.close, "while closing the zmq socket")
-  end # def teardown
+    context.terminate
+  end # def close
 
   def server?
     @mode == "server"
@@ -124,12 +125,14 @@ class LogStash::Inputs::ZeroMQ < LogStash::Inputs::Base
   def run(output_queue)
     host = Socket.gethostname
     begin
-      loop do
+      while !stop?
         # Here's the unified receiver
         # Get the first part as the msg
         m1 = ""
-        rc = @zsocket.recv_string(m1)
+        rc = @zsocket.recv_string(m1, ZMQ::DONTWAIT)
+        next if rc == -1 && ZMQ::Util.errno == ZMQ::EAGAIN
         error_check(rc, "in recv_string")
+
         @logger.debug("ZMQ receiving", :event => m1)
         msg = m1
         # If we have more parts, we'll eat the first as the topic
@@ -142,16 +145,12 @@ class LogStash::Inputs::ZeroMQ < LogStash::Inputs::Base
           @logger.debug("ZMQ receiving", :event => m2)
           msg = m2
         end
-
         @codec.decode(msg) do |event|
           event["host"] ||= host
           decorate(event)
           output_queue << event
         end
       end
-    rescue LogStash::ShutdownSignal
-      # shutdown
-      return
     rescue => e
       @logger.debug("ZMQ Error", :subscriber => @zsocket,
                     :exception => e)
@@ -163,4 +162,5 @@ class LogStash::Inputs::ZeroMQ < LogStash::Inputs::Base
   def build_source_string
     id = @address.first.clone
   end
+
 end # class LogStash::Inputs::ZeroMQ

data/lib/logstash/util/zeromq.rb

@@ -3,13 +3,12 @@ require 'ffi-rzmq'
 require "logstash/namespace"
 
 module LogStash::Util::ZeroMQ
-  CONTEXT = ZMQ::Context.new
   # LOGSTASH-400
   # see https://github.com/chuckremes/ffi-rzmq/blob/master/lib/ffi-rzmq/socket.rb#L93-117
   STRING_OPTS = %w{IDENTITY SUBSCRIBE UNSUBSCRIBE}
 
   def context
-    CONTEXT
+    @context ||= ZMQ::Context.new
   end
 
   def setup(socket, address)

data/logstash-input-zeromq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-zeromq'
-  s.version         = '1.0.0'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "$summary"
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'ffi-rzmq', '~> 2.0.4'

data/spec/inputs/zeromq_spec.rb

@@ -1 +1,27 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require_relative "../spec_helper"
+require "logstash/plugin"
+require "logstash/event"
+
+describe LogStash::Inputs::ZeroMQ, :zeromq => true do
+
+  context "when register and close" do
+
+    let(:plugin) { LogStash::Plugin.lookup("input", "zeromq").new({ "topology" => "pushpull" }) }
+
+    it "should register and close without errors" do
+      expect { plugin.register }.to_not raise_error
+      expect { plugin.close }.to_not raise_error
+    end
+
+    context "when interrupting the plugin" do
+      it_behaves_like "an interruptible input plugin" do
+        let(:config) { { "topology" => "pushpull" } }
+        after do
+          subject.close
+        end
+      end
+    end
+
+  end
+end

data/spec/integration/zeromq_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+require_relative "../spec_helper"
+require "logstash/plugin"
+require "logstash/event"
+
+describe LogStash::Inputs::ZeroMQ, :integration => true do
+
+  describe "receive events" do
+
+    let(:nevents)  { 10 }
+    let(:port)     { rand(1000)+1025 }
+
+    let(:conf) do
+      {  "address" => ["tcp://127.0.0.1:#{port}"],
+         "topology" => "pubsub" }
+    end
+
+    let(:events) do
+      input(conf, nevents) do
+        client = ZeroMQClient.new("127.0.0.1", port)
+        nevents.times do |value|
+          client.send("data #{value}")
+        end
+        client.close
+      end
+    end
+
+    it "should receive the events" do
+      expect(events.count).to be(nevents)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/zeromq"
+require_relative "support/client"
+
+module ZeroMQHelpers
+
+  def setup_clients(number_of_clients, port)
+    number_of_clients.times.inject([]) do |clients|
+      clients << ZeroMQClient.new(localhost, port)
+    end
+  end
+
+  def input(config, size, &block)
+    plugin = LogStash::Plugin.lookup("input", "zeromq").new(config)
+    plugin.register
+    queue  = Queue.new
+
+    pipeline_thread = Thread.new { plugin.run(queue) }
+    sleep 0.3
+    block.call
+    sleep 0.1 while queue.size != size
+    result = size.times.inject([]) do |acc|
+      acc << queue.pop
+    end
+    plugin.do_stop
+    pipeline_thread.join
+    result
+  end # def input
+
+end
+
+RSpec.configure do |config|
+  config.include ZeroMQHelpers
+  config.filter_run_excluding({ :zeromq => true, :integration => true })
+  config.order = :random
+end

data/spec/support/client.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'ffi-rzmq'
+
+class ZeroMQClient
+
+  attr_reader :addr, :port, :context, :requester
+
+  def initialize(addr, port)
+    @addr   = addr
+    @port   = port
+    @context = ZMQ::Context.new(1)
+    @requester = context.socket(ZMQ::PUB)
+    @requester.connect("tcp://#{addr}:#{port}")
+  end
+
+  def send(data)
+    @requester.send_string(data)
+  end
+
+  def close
+    @requester.close
+    @context.terminate
+  end
+end

metadata

@@ -1,95 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-zeromq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ffi-rzmq
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.4
+  name: ffi-rzmq
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
+  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
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/zeromq.rb
 - lib/logstash/util/zeromq.rb
 - logstash-input-zeromq.gemspec
 - spec/inputs/zeromq_spec.rb
+- spec/integration/zeromq_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -112,9 +107,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: $summary
 test_files:
 - spec/inputs/zeromq_spec.rb
+- spec/integration/zeromq_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"