logstash-input-rabbitmq 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb907c268fdbcec47e813f94ea1b59f2bfcc79b2
-  data.tar.gz: 2563a5a64b1b387a6f1fcebcc15f3bdfae4794c1
+  metadata.gz: 425af10298c6f798e8d62fc4191cc5eed01c2ccc
+  data.tar.gz: 3110a74f2ce80e6336dab525e28abf4283157367
 SHA512:
-  metadata.gz: ec9c0534f7c5885d21a8400132531c0b70fecba815cefc8c882e9f28d5384a9ac9d978802c4f860433bb95e8f968783db3acb7a122b83336cf9a4c37aa06fc32
-  data.tar.gz: 933e4647378eeb7557c1b3ea01e2b79ed8932c2faf2f505d92b0504ad146f19118c2b3e78c29b267a2b192fde24824ffc9cf318585c59d87471b77408f454ebc
+  metadata.gz: 2a301efb81cedfeead47c8a6c1e815f3b038398799a8017d6a22f6e219eaa20803f9766268e4e1d5a145f2b6c300a07d33b856a193284643825ba2cb5e251408
+  data.tar.gz: 79585a7e5224f00056678d762c89b50127e219734e156a4625515be7bfbd5dfe966ebc82678473f91887384555101603ded9cf1736c48d8e756dbe8a2dd24e5f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.2.0
+  - Fix behavior where plugin would block on register if server was unavailable
+    Plugin will now always exit register successfully and just log errors on #run
+  - Bumped connection mixin dependency to better handle proxies and error logging
+
 ## 5.1.1
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -171,7 +171,15 @@ module LogStash
 
       def register
         @internal_queue = java.util.concurrent.ArrayBlockingQueue.new(@prefetch_count*2)
+      end
+
+      def run(output_queue)
+        setup!
+        @output_queue = output_queue
+        consume!
+      end
 
+      def setup!
         connect!
         declare_queue!
         bind_exchange!
@@ -185,11 +193,6 @@ module LogStash
         retry
       end
 
-      def run(output_queue)
-        @output_queue = output_queue
-        consume!
-      end
-
       def bind_exchange!
         if @exchange
           if @exchange_type # Only declare the exchange if @exchange_type is set!

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '5.1.1'
+  s.version         = '5.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Pull events from a RabbitMQ exchange."
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 4.1.1', '< 5.0.0'
+  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 4.2.0', '< 5.0.0'
 
   s.add_runtime_dependency 'logstash-codec-json'
 

data/spec/inputs/rabbitmq_spec.rb

@@ -36,13 +36,14 @@ describe LogStash::Inputs::RabbitMQ do
       allow(instance).to receive(:connect!).and_call_original
       allow(::MarchHare).to receive(:connect).and_return(connection)
       allow(connection).to receive(:create_channel).and_return(channel)
+      allow(connection).to receive(:on_shutdown)
       allow(connection).to receive(:on_blocked)
       allow(connection).to receive(:on_unblocked)
       allow(channel).to receive(:exchange).and_return(exchange)
       allow(channel).to receive(:queue).and_return(queue)
       allow(channel).to receive(:prefetch=)
 
-      allow(queue).to receive(:build_consumer).with(:block => true)
+      allow(queue).to receive(:build_consumer).with(:on_cancellation => anything)
       allow(queue).to receive(:subscribe_with).with(any_args)
       allow(queue).to receive(:bind).with(any_args)
     end
@@ -57,6 +58,7 @@ describe LogStash::Inputs::RabbitMQ do
       context "without an exchange declared" do
         before do
           instance.register
+          instance.setup!
         end
 
         it "should set the queue correctly" do
@@ -77,9 +79,10 @@ describe LogStash::Inputs::RabbitMQ do
           allow(instance).to receive(:declare_exchange!)
         end
 
-        context "on register" do
+        context "on run" do
           before do
             instance.register
+            instance.setup!
           end
 
           it "should bind to the exchange" do
@@ -102,6 +105,7 @@ describe LogStash::Inputs::RabbitMQ do
 
           it "should reconnect" do
             instance.register
+            instance.setup!
             expect(queue).to have_received(:bind).with(any_args).twice()
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Pull events from a RabbitMQ exchange.