logstash-mixin-zeromq 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581a303492a25d46f0bd462e8cddf2464d2cea18
-  data.tar.gz: 460addf350a60201f1230e14c9450fcca928fb2f
+  metadata.gz: cec5dfe3f6667e06e871a68fba24a5bf23808a10
+  data.tar.gz: 66cc806229bdfb70d3cc1e82772459392fa976bd
 SHA512:
-  metadata.gz: 01251b1a3cf3e13d59939e2f3bbe79b8139177c92777664845dd18e73747d588cece9c2402492864f7c16e4f9ad6c2a1674c9e8e83c166122e3d6528ee47953a
-  data.tar.gz: 4cfd55e56dc3623912e5ddb5502159553e7b79347f1ecab4b86e57beefad84d14c1a342263299b0606996e9d0648e6f841d11fd5ab041e04c00d2d463f045e74
+  metadata.gz: 7d04902c5705478eafd9e2356ea0647dc141c0cbcb0bc94f281bb722be63bea81c54aeade0788edbe5e8de08bc3267a203016485db801e016da83dbd9d640a12
+  data.tar.gz: 4c8010338df5598bf0fee3e0798e8cde399a8e5ed15199f436d01d700807186653d3a4e024d0223f416696b0cfcf115cb3f8a57bec03c8c30a303f940c44e0c7

data/lib/logstash/plugin_mixins/zeromq.rb

@@ -20,8 +20,8 @@ module LogStash::PluginMixins::ZeroMQ
     @logger.info("0mq: #{server? ? 'connected' : 'bound'}", :address => address)
   end
 
-  def error_check(rc, doing)
-    unless ZMQ::Util.resultcode_ok?(rc)
+  def error_check(rc, doing, eagain_not_error=false)
+    unless ZMQ::Util.resultcode_ok?(rc) || (ZMQ::Util.errno == ZMQ::EAGAIN && eagain_not_error)
       @logger.error("ZeroMQ error while #{doing}", { :error_code => rc })
       raise "ZeroMQ Error while #{doing}"
     end

data/logstash-util-zeromq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-mixin-zeromq'
-  s.version         = '2.0.0'
+  s.version         = '2.0.1'
   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"

data/spec/plugin_mixins/zeromq_spec.rb

@@ -43,10 +43,10 @@ describe LogStash::PluginMixins::ZeroMQ do
     end
 
     context "a client" do
-      let(:impl_client) { 
+      let(:impl_client) {
         d = Dummy.new(basic_config)
         d.mode = "client"
-        d 
+        d
       }
 
       it "should setup a client, connecting to address without error" do
@@ -64,6 +64,16 @@ describe LogStash::PluginMixins::ZeroMQ do
       expect { impl.error_check(-1, "test return values" ) }.to raise_error
       expect { impl.error_check(-999, "test return values" ) }.to raise_error
     end
+
+    it "should raise an error for ZMQ::EAGAIN if eagain_not_error=false" do
+      allow(ZMQ::Util).to receive(:errno).and_return(ZMQ::EAGAIN)
+      expect { impl.error_check(-1, "test return values", false) }.to raise_error
+    end
+
+    it "should not raise an error for ZMQ::EAGAIN if eagain_not_error=true" do
+      allow(ZMQ::Util).to receive(:errno).and_return(ZMQ::EAGAIN)
+      expect { impl.error_check(-1, "test return values", true) }.to_not raise_error
+    end
   end
 
   context "when socketopts" do
@@ -92,4 +102,4 @@ describe LogStash::PluginMixins::ZeroMQ do
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-zeromq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic