logstash-input-rabbitmq 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0507d6cfebcee1574e915e72dcde6851d4b6584d
-  data.tar.gz: 066a1bf95bf831b85e7bbc3badb0830477cbdd8e
+  metadata.gz: f93375b1eaa4816cd3abbef1aeaa4f6d4f80045f
+  data.tar.gz: 4f06a024d67fcc9da7e5c8a4a1fb1ee2aa44ea2b
 SHA512:
-  metadata.gz: 17958b74fcd840beba8247d5654db7b6b203ec1e7515d24dcefcab4f884aa2a57db119e79668d3a28db06bc87e35a238f1cc41e1276fac8f38ce543ba57d50fb
-  data.tar.gz: c13776c81987dc71144de3e91e532bf2b2f58daa03d2baf2276ce51a3cb2f66f4ba392005236c02f74ffe0c24bfc24953fd2aec3eca2f273583e3af649b0da36
+  metadata.gz: a0da602e8f34599aca96f97057a59bb9f2a12b67c5b37c72f5c08a5fdfcf9b5a7f2272840235acd31e4dd994ff1d673a247f339560782db5944a5b41221a8ff7
+  data.tar.gz: 6cc9ab957d7e94ef0dd154a3e3d920d58d4e4dcb603a5589860a60c68f7850eee63ead3aa0a3d08c8cc9178863c64aba44f78d2577481d2141658f654f3c58ed

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.5
+ - Fix a bug where when reconnecting a duplicate consumer would be created
+
 ## 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
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -102,32 +102,25 @@ module LogStash
         # 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)
+        @consumer = @hare_info.queue.build_consumer() 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
+
+        begin
+          @hare_info.queue.subscribe_with(@consumer, :manual_ack => @ack)
+        rescue MarchHare::Exception => e
+          @logger.warn("Could not subscribe to queue! Will retry in #{@subscription_retry_interval_seconds} seconds", :queue => @queue)
+
+          sleep @subscription_retry_interval_seconds
+          retry
+        end
 
-          Stud.stoppable_sleep(@subscription_retry_interval_seconds) { stop? }
-          break if stop? # In case an error was hit before the break above was hit
+        while !stop?
+          sleep 1
         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.4'
+  s.version         = '3.1.5'
   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"

metadata

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