logstash-input-bunny 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487f8d41ea9e2a064b28f88d2fd529e7377d7b95
-  data.tar.gz: 8d3dcccf5a8cbef0c613b4719ec2d5721b06db19
+  metadata.gz: 8238a1a39e481d7fcf15ee72f9bde6bf2ee199e7
+  data.tar.gz: 39104fa26e88ec08af8d6e9b9cc54c5ccab6d729
 SHA512:
-  metadata.gz: 6923f0ef09f74d11e50263cc1968ae298d80bb3617c200fbd2507965f57284e1b14c2c35d306385a291cf25d79a363c34a626837c906e8ee376d33c7bf6c198a
-  data.tar.gz: 143ff56b99187dbb006efc7cf9db8c8aff5e54fcb7ce71b0fedeefa9029996abef3582a7a3faaf83c8342395a9eaaf14f8bd912e844913ef50983260384293c5
+  metadata.gz: a4fa70c7d75686779ab76f5d11b185a92dd75b53db651ed6da8a8b833fcbff2fa09d4188c933a54b6a5ed2cfaf0ef43245dae5d95908e728d9c5395b30c5b0d2
+  data.tar.gz: 9b6a99dea0f7253db067d238f75191154fb69757f6fd631460cd6a51acc0c1006e964ab382cf911791d73a262131a5ed785bf41190c579d0d56a5cb774de89ec

data/lib/logstash/inputs/bunny.rb

@@ -110,6 +110,14 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
 
     super
   end
+  
+  def consumer_id
+    @consumer_id ||= "#{`hostname -s`.strip}-#{Thread.current.object_id}"
+  end
+
+  def input_name
+    @exchange.nil? or @key.nil? ? queue : "#{@exchange}:#{@key}"
+  end
 
   include ::LogStash::Inputs::RabbitMQ::BunnyImpl
 
@@ -128,7 +136,7 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
       # make sure we don't leave any consumer work pool
       # threads behind. MK.
       @ch.maybe_kill_consumer_work_pool!
-      @logger.error("RabbitMQ connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...")
+      @logger.error("RabbitMQ[#{input_name}] connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...")
 
       sleep n
       retry
@@ -136,7 +144,7 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
     rescue OpenSSL::SSL::SSLError => e
       n = Bunny::Session::DEFAULT_NETWORK_RECOVERY_INTERVAL * 2
 
-      @logger.error("RabbitMQ SSL connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...")
+      @logger.error("RabbitMQ[#{input_name}] SSL connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...")
       sleep n
       retry
 
@@ -144,7 +152,7 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
       # ignore and quit
     
     rescue Exception => e
-      @logger.error("RabbitMQ unhandled exception: #{e.inspect}")
+      @logger.error("RabbitMQ[#{input_name}] unhandled exception: #{e.inspect}")
       @logger.error(e.backtrace)
     end
   end
@@ -168,7 +176,6 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
   end
 
   def consume
-    consumer_id = "#{`hostname -s`.strip}-#{Thread.current.object_id}"
     @logger.info("Will consume events from queue #{@q.name} as #{consumer_id}")
 
     no_ack = !@ack

data/logstash-input-bunny.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-bunny'
-  s.version         = '0.1.9'
+  s.version         = '0.1.10'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-bunny
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Jonathan Serafini