logstash-output-rabbitmq 1.1.0-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89989010433ce0b5c2eb56006cefbb38eb71e465
-  data.tar.gz: 004f589a86bbbcb901167a38976c411c2b1d7dab
+  metadata.gz: f90bba8313de38efee5748671982e961ccffa45d
+  data.tar.gz: c1717cbf3f6fe180019d05f0be50defbe6fd189b
 SHA512:
-  metadata.gz: 9cce7f5bd69bd54c440b21f0cb1c89879fec275b58c63c17cc30536e9d2c61646e74e33f968f247e7d44dcd99606704168251aa4f54a31cafc4a08c62483d06d
-  data.tar.gz: de07d8b894eb6c93bbeb2ed82d70587a5ffd764a2dc924021134e6dae629718c085b496ecfe58f31fce16fd9892e58bfa057c7f9d6c2714b8dbc3e650b0b3138
+  metadata.gz: 352f5418b8b42011a5f76d520a184672f75f47e64c7a46104034fca13265568a86a2e35473e2b3262181c1c06abc5b4b346022475c6c414ebb5fa27ca9a73e73
+  data.tar.gz: da4785cc8e35380cb40540b9c03c2674ec7dd3709918e785b6281ec39533c9ba83c4436109773664fa3386f3cbb7d41c2a1eb201e3b3d9cb4742fefdd8405219

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+* 1.1.1
+ - Fix nasty bug that caused connection duplication on conn recovery
 * 1.1.0
  - Many internal refactors
  - Bump march hare version to 2.11.0

data/lib/logstash/outputs/rabbitmq.rb

@@ -42,7 +42,7 @@ class LogStash::Outputs::RabbitMQ < LogStash::Outputs::Base
   # Enable or disable logging
   config :debug, :validate => :boolean, :default => false, :deprecated => "Use the logstash --debug flag for this instead."
 
-  # Try to automatically recovery from broken connections. You almost certainly don't want to override this!!!
+  # Set this to automatically recover from a broken connection. You almost certainly don't want to override this!!!
   config :automatic_recovery, :validate => :boolean, :default => true
 
   # The exchange type (fanout, topic, direct)
@@ -98,7 +98,6 @@ class LogStash::Outputs::RabbitMQ < LogStash::Outputs::Base
                   :backtrace => e.backtrace)
 
     sleep_for_retry
-    connect!
     retry
   end
 
@@ -142,18 +141,29 @@ class LogStash::Outputs::RabbitMQ < LogStash::Outputs::Base
     channel = connection.create_channel
     @logger.info("Connected to RabbitMQ at #{settings[:host]}")
 
+    exchange = declare_exchange!(channel)
+
+    HareInfo.new(connection, channel, exchange)
+  end
+
+  private
+  def declare_exchange!(channel)
     @logger.debug("Declaring an exchange", :name => @exchange,
                   :type => @exchange_type, :durable => @durable)
-
     exchange = channel.exchange(@exchange, :type => @exchange_type.to_sym, :durable => @durable)
     @logger.debug("Exchange declared")
-
-    HareInfo.new(connection, channel, exchange)
+    exchange
+  rescue StandardError => e
+    @logger.error("Could not declare exchange!",
+                  :exchange => @exchange, :type => @exchange_type,
+                  :durable => @durable, :error_class => e.class.name,
+                  :error_message => e.message, :backtrace => e.backtrace)
+    raise e
   end
 
   private
   def connect!
-    @hare_info = connect() unless connection_open?
+    @hare_info = connect()
   rescue MarchHare::Exception => e
     return if terminating?
 

data/logstash-output-rabbitmq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-rabbitmq'
-  s.version         = '1.1.0'
+  s.version         = '1.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Push events to 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-output-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core