logstash-input-bunny 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8238a1a39e481d7fcf15ee72f9bde6bf2ee199e7
-  data.tar.gz: 39104fa26e88ec08af8d6e9b9cc54c5ccab6d729
+  metadata.gz: 6a3d026a10ffe2b4a072e4a5584ef2bd1003db28
+  data.tar.gz: fd96ffef182ced185b47afffaf8a6693272c04db
 SHA512:
-  metadata.gz: a4fa70c7d75686779ab76f5d11b185a92dd75b53db651ed6da8a8b833fcbff2fa09d4188c933a54b6a5ed2cfaf0ef43245dae5d95908e728d9c5395b30c5b0d2
-  data.tar.gz: 9b6a99dea0f7253db067d238f75191154fb69757f6fd631460cd6a51acc0c1006e964ab382cf911791d73a262131a5ed785bf41190c579d0d56a5cb774de89ec
+  metadata.gz: 478a7b649be84c2b471638313432e8af954d2901aaa748c4c30c4f3324423d39d4fc4d5ff0bbf432723061e9a2eb97e1560bedfbca32c0fc23587e8a1202201c
+  data.tar.gz: 0510b6343762f258e8ad974d1d560d378fe829da547810df178b5c24595073b8f4082ab2606a2c588a62cd79b517e2a47c6463f03d2115ed6fb07a8ea01cdbe8

data/lib/logstash/inputs/bunny.rb

@@ -111,14 +111,6 @@ 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
 
   def run(output_queue)
@@ -175,6 +167,50 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
     finished
   end
 
+  protected
+
+  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
+
+  def setup
+    return if terminating?
+
+    begin
+      attempts ||= 3
+      
+      @logger.debug("RabbitMQ[#{input_name}] connecting.")
+      @conn = Bunny.new(@settings)
+      @conn.start
+    rescue OpenSSL::SSL::SSLError
+      @logger.warn("SSL Handshake failed, retrying.")
+      attempts -= 1
+      retry unless attempts == 0
+    end
+
+    @logger.info("RabbitMQ[#{input_name}] connected at #{@settings[:host]}")
+    @ch = @conn.create_channel.tap do |ch|
+      ch.prefetch(@prefetch_count)
+    end
+
+    @arguments_hash = Hash[*@arguments]
+    @q = @ch.queue(@queue,
+           :durable     => @durable,
+           :auto_delete => @auto_delete,
+           :exclusive   => @exclusive,
+           :passive     => @passive,
+           :arguments   => @arguments)
+
+    # exchange binding is optional for the input
+    if @exchange
+      @q.bind(@exchange, :routing_key => @key)
+    end
+  end
+
   def consume
     @logger.info("Will consume events from queue #{@q.name} as #{consumer_id}")
 
@@ -193,5 +229,6 @@ class LogStash::Inputs::Bunny < LogStash::Inputs::Threadable
 
     @q.subscribe_with(@consumer, block: true)
   end
+  
 end # class LogStash::Inputs::RabbitMQ
 

data/logstash-input-bunny.gemspec

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