logstash-mixin-zeromq 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec5dfe3f6667e06e871a68fba24a5bf23808a10
-  data.tar.gz: 66cc806229bdfb70d3cc1e82772459392fa976bd
+  metadata.gz: b320269e688ab131038a42709a944cc52431b9a4
+  data.tar.gz: b9e7cd554cd196100a14c0823c670c09725ad1b2
 SHA512:
-  metadata.gz: 7d04902c5705478eafd9e2356ea0647dc141c0cbcb0bc94f281bb722be63bea81c54aeade0788edbe5e8de08bc3267a203016485db801e016da83dbd9d640a12
-  data.tar.gz: 4c8010338df5598bf0fee3e0798e8cde399a8e5ed15199f436d01d700807186653d3a4e024d0223f416696b0cfcf115cb3f8a57bec03c8c30a303f940c44e0c7
+  metadata.gz: 0a0259f8102693e985f83a6f80eafa62c99ec6ca63bd318b6368be1f12a37fad25087fcfbaab79a9bea776d85e9993053489f4e5808fc97692244cf56820f485
+  data.tar.gz: f96239b1f52883b1c2f694fefd6fbedf6ec6e52f6d5b8a055f93b5c92a64f7809f66db1734067bb76126519a431813988d58746a08681f05756264d7a983659f

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/plugin_mixins/zeromq.rb

@@ -2,13 +2,25 @@
 require 'ffi-rzmq'
 require "logstash/namespace"
 
+class LogStash::PluginMixins::ZeroMQContext
+  class << self
+    def context
+      @context ||= ZMQ::Context.new
+    end
+  end
+end
+
 module LogStash::PluginMixins::ZeroMQ
   # 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 ||= ZMQ::Context.new
+    LogStash::PluginMixins::ZeroMQContext.context
+  end
+
+  def terminate_context
+    context.terminate
   end
 
   def setup(socket, address)
@@ -17,7 +29,7 @@ module LogStash::PluginMixins::ZeroMQ
     else
       error_check(socket.connect(address), "connecting to #{address}")
     end
-    @logger.info("0mq: #{server? ? 'connected' : 'bound'}", :address => address)
+    @logger.info("0mq: #{server? ? 'bound' : 'connected'}", :address => address)
   end
 
   def error_check(rc, doing, eagain_not_error=false)

data/{logstash-util-zeromq.gemspec → logstash-mixin-zeromq.gemspec}

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-mixin-zeromq'
-  s.version         = '2.0.1'
+  s.version         = '2.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Mixin to share code for zeromq input, output and filter"
-  s.description     = "This gem contains mixin functions, used by 0MQ logstash plugins. This gem is not a stand-alone program"
+  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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"

data/spec/plugin_mixins/zeromq_spec.rb

@@ -18,6 +18,7 @@ describe LogStash::PluginMixins::ZeroMQ do
     d.mode = "server"
     d
   }
+  let(:tracer) { double("logger") }
 
   it "should initialize with no extra settings" do
     expect {
@@ -40,6 +41,13 @@ describe LogStash::PluginMixins::ZeroMQ do
       it "should setup a server, bind to address without error" do
         expect { impl.setup(socket, "tcp://127.0.0.1:#{port}") }.to_not raise_error
       end
+
+      it "a 'bound' info line is logged" do
+        allow(tracer).to receive(:debug)
+        impl.logger = tracer
+        expect(tracer).to receive(:info).with("0mq: bound", {:address=>"tcp://127.0.0.1:#{port}"})
+        impl.setup(socket, "tcp://127.0.0.1:#{port}")
+      end
     end
 
     context "a client" do
@@ -49,6 +57,13 @@ describe LogStash::PluginMixins::ZeroMQ do
         d
       }
 
+      it "a 'connected' info line is logged" do
+        allow(tracer).to receive(:debug)
+        impl_client.logger = tracer
+        expect(tracer).to receive(:info).with("0mq: connected", {:address=>"tcp://127.0.0.1:#{port}"})
+        impl_client.setup(socket, "tcp://127.0.0.1:#{port}")
+      end
+
       it "should setup a client, connecting to address without error" do
         expect { impl_client.setup(socket, "tcp://127.0.0.1:#{port}") }.to_not raise_error
       end
@@ -100,6 +115,5 @@ describe LogStash::PluginMixins::ZeroMQ do
     it "should set multiple options" do
       expect { impl.setopts(socket, { "ZMQ::SNDHWM" => "50", "ZMQ::SNDBUF" => "50" } ) }.to_not raise_error
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-zeromq
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem contains mixin functions, used by 0MQ logstash plugins. 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/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -85,7 +85,7 @@ files:
 - NOTICE.TXT
 - README.md
 - lib/logstash/plugin_mixins/zeromq.rb
-- logstash-util-zeromq.gemspec
+- logstash-mixin-zeromq.gemspec
 - spec/plugin_mixins/zeromq_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: