logstash-input-rabbitmq 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b1ce0ea58bfa665489175420267cdc7d4de926
-  data.tar.gz: 269db5d3a032d318d4302852628fa351076b8b8d
+  metadata.gz: 0507d6cfebcee1574e915e72dcde6851d4b6584d
+  data.tar.gz: 066a1bf95bf831b85e7bbc3badb0830477cbdd8e
 SHA512:
-  metadata.gz: d4778c747ff78c0e5c857493e55f9ea25563dca8f9d6a48c5d4659ae977bfb1f1f96b0e96a812654b9e2c3d59f277873590cd66d2b9aa30378ac7c7deecb7f9c
-  data.tar.gz: 2123805fa8f03a7a394c1cb6a17b5a5c0b2cbd963d0834745be4e657b6b3ec33397306d3c0777f4180e2651f356e114734b4bb9a9d4bf77957e2b39a632e8e29
+  metadata.gz: 17958b74fcd840beba8247d5654db7b6b203ec1e7515d24dcefcab4f884aa2a57db119e79668d3a28db06bc87e35a238f1cc41e1276fac8f38ce543ba57d50fb
+  data.tar.gz: c13776c81987dc71144de3e91e532bf2b2f58daa03d2baf2276ce51a3cb2f66f4ba392005236c02f74ffe0c24bfc24953fd2aec3eca2f273583e3af649b0da36

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.4
+ - Fix a bug where this plugin would not properly reconnect if it lost its connection to the server while the connection would re-establish itself, the queue subscription would not
+
 ## 3.1.3
  - Fix a spec that shouldn't have broken with LS2.2
 ## 3.1.2

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-rabbitmq-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-rabbitmq-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-rabbitmq.svg)](https://travis-ci.org/logstash-plugins/logstash-input-rabbitmq)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -86,4 +85,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/elastic/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/rabbitmq.rb

@@ -52,6 +52,10 @@ module LogStash
       # * Wildcards are not valid on direct exchanges.
       config :key, :validate => :string, :default => "logstash"
 
+      # Amount of time in seconds to wait after a failed subscription request
+      # before retrying. Subscribes can fail if the server goes away and then comes back
+      config :subscription_retry_interval_seconds, :validate => :number, :required => true, :default => 5
+
       def register
         connect!
         declare_queue!
@@ -93,15 +97,38 @@ module LogStash
       def consume!
         # we manually build a consumer here to be able to keep a reference to it
         # in an @ivar even though we use a blocking version of HB::Queue#subscribe
-        @consumer = @hare_info.queue.build_consumer(:block => true) do |metadata, data|
-          @codec.decode(data) do |event|
-            decorate(event)
-            @output_queue << event if event
+
+        # The logic here around resubscription might seem strange, but its predicated on the fact
+        # that we rely on MarchHare to do the reconnection for us with auto_reconnect.
+        # Unfortunately, while MarchHare does the reconnection work it won't re-subscribe the consumer
+        # hence the logic below.
+        loop do
+          begin
+            @consumer = @hare_info.queue.build_consumer(:block => true) do |metadata, data|
+              @codec.decode(data) do |event|
+                decorate(event)
+                @output_queue << event if event
+              end
+              @hare_info.channel.ack(metadata.delivery_tag) if @ack
+            end
+
+            if @hare_info.connection.connected?
+              @logger.info("Will subscribe with consumer", :config => config)
+              @hare_info.queue.subscribe_with(@consumer, :manual_ack => @ack, :block => true)
+              @logger.warn("Queue subscription ended! Will retry in #{@subscription_retry_interval_seconds}s", :config => config)
+            else
+              @logger.info("RabbitMQ connection down, will wait to retry subscription", :config => config)
+            end
+
+            break if stop?
+            @consumer.gracefully_shut_down # Try to clean up gracefully
+          rescue MarchHare::Exception => e
+            @logger.warn("Error re-subscribing to queue!", :config => config, :message => e.message, :class => e.class.name)
           end
-          @hare_info.channel.ack(metadata.delivery_tag) if @ack
-        end
 
-        @hare_info.queue.subscribe_with(@consumer, :manual_ack => @ack, :block => true)
+          Stud.stoppable_sleep(@subscription_retry_interval_seconds) { stop? }
+          break if stop? # In case an error was hit before the break above was hit
+        end
       end
 
       def stop
@@ -117,4 +144,4 @@ module LogStash
 
     end
   end
-end
+end

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '3.1.3'
+  s.version         = '3.1.4'
   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/plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/rabbitmq_spec.rb

@@ -91,6 +91,20 @@ describe LogStash::Inputs::RabbitMQ do
             expect(queue).to have_received(:bind).with(any_args).twice()
           end
         end
+
+        context "initially unable to subscribe" do
+          before do
+            i = 0
+            allow(queue).to receive(:subscribe_with).with(any_args) do
+              i += 1
+              raise "sub error" if i == 1
+            end
+
+            it "should retry the subscribe" do
+              expect(queue).to have_receive(:subscribe_with).twice()
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core