logstash-input-rabbitmq 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9811d797eb070d68e2463e7eba3e013592b5b7a
-  data.tar.gz: 5b5596bd163c460fe4616783e0517e4715e75683
+  metadata.gz: 1569aff8f5c9ad1d47f104b671a63ccfe206d7f2
+  data.tar.gz: 6dd6f5cbe237df3c8c8a95480db9ea4d87d102a9
 SHA512:
-  metadata.gz: 2d48171b808b11167286a324cb77acfb15738cc12ec2d28acb1b40ad1ea13c7c91feef3af53e54b56a5ebd12e7ac7f1a93e6033d84c29097b398f941f3e8d4cd
-  data.tar.gz: c4a782a78990e84e692637c3c8c7f907f829f119c4ce5afdb5aa7732b4d85245873612d9b1aee0ec9e34530d033bc13facd92650ab965f4b09ad9719a4c4316b
+  metadata.gz: fb0304e6c8d3d6d2b76edd4c9e47433207264cd046041d705e1f0ad3691974acd53c64514e8ff07a25b31db6358ae3881b61314504b0f3c1da05c95cd5ca9e82
+  data.tar.gz: 77ef5d47aa3beb2f55e9206f4a054ebe8ceb021524f95a55ef1e14ab52e3a35f5bb70ef8879ce2e3f5faec783ba279e6b2af70035a5608fe88e3a943b74968ac

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# 3.1.2
+ - Upgrade march hare version to fix file perms issue
 ## 3.1.1
  - Default codec setting should have been JSON
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -42,7 +42,7 @@ module LogStash
       # Passive queue creation? Useful for checking queue existance without modifying server state
       config :passive, :validate => :boolean, :default => false
 
-      # The name of the exchange to bind the queue to
+      # The name of the exchange to bind the queue to.
       config :exchange, :validate => :string
 
       # The routing key to use when binding a queue to the exchange.
@@ -52,12 +52,18 @@ module LogStash
       # * Wildcards are not valid on direct exchanges.
       config :key, :validate => :string, :default => "logstash"
 
-
       def register
         connect!
         declare_queue!
         bind_exchange!
         @hare_info.channel.prefetch = @prefetch_count
+      rescue => e
+        @logger.warn("Error while setting up connection for rabbitmq input! Will retry.",
+                     :message => e.message,
+                     :class => e.class.name,
+                     :location => e.backtrace.first)
+        sleep_for_retry
+        retry
       end
 
       def run(output_queue)

data/logstash-input-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-rabbitmq'
-  s.version         = '3.1.1'
+  s.version         = '3.1.2'
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
-  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 2.2.0', '< 3.0.0'
+  s.add_runtime_dependency "logstash-mixin-rabbitmq_connection", '>= 2.3.0', '< 3.0.0'
 
   s.add_runtime_dependency 'logstash-codec-json'
 

data/spec/inputs/rabbitmq_spec.rb

@@ -30,6 +30,7 @@ describe LogStash::Inputs::RabbitMQ do
     let(:channel) { double("Channel") }
     let(:queue) { double("queue") }
 
+    # Doing this in a before block doesn't give us enough control over scope
     before do
       allow(instance).to receive(:connect!).and_call_original
       allow(::MarchHare).to receive(:connect).and_return(connection)
@@ -42,8 +43,7 @@ describe LogStash::Inputs::RabbitMQ do
 
       allow(queue).to receive(:build_consumer).with(:block => true)
       allow(queue).to receive(:subscribe_with).with(any_args)
-
-      instance.register
+      allow(queue).to receive(:bind).with(any_args)
     end
 
     it "should default the codec to JSON" do
@@ -53,16 +53,44 @@ describe LogStash::Inputs::RabbitMQ do
     describe "#connect!" do
       subject { hare_info }
 
-      it "should set the queue correctly" do
-        expect(subject.queue).to eql(queue)
-      end
+      context "without an exchange declared" do
+        before do
+          instance.register
+        end
+
+        it "should set the queue correctly" do
+          expect(subject.queue).to eql(queue)
+        end
 
-      it "should set the prefetch value correctly" do
-        expect(channel).to have_received(:prefetch=).with(123)
+        it "should set the prefetch value correctly" do
+          expect(channel).to have_received(:prefetch=).with(123)
+        end
       end
 
       context "with an exchange declared" do
-        let(:instance) { rabbitmq_settings.merge("exchange" => "myexchange", "exchange_type" => "fanout") }
+        let(:exchange) { double("exchange") }
+        let(:key) { double("routing key") }
+        let(:rabbitmq_settings) { super.merge("exchange" => exchange, "key" => key) }
+
+        it "should bind to the exchange" do
+          instance.register
+          expect(queue).to have_received(:bind).with(exchange, :routing_key => key)
+        end
+
+        context "but not immediately available" do
+          before do
+            i = 0
+            allow(queue).to receive(:bind).with(any_args) do
+              i += 1
+              raise "foo" if i == 1
+            end
+          end
+
+          it "should reconnect" do
+            instance.register
+            expect(queue).to have_received(:bind).with(any_args).twice()
+          end
+        end
       end
     end
   end

metadata

@@ -1,16 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -19,79 +28,70 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-mixin-rabbitmq_connection
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.3.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-mixin-rabbitmq_connection
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elastic.co
 executables: []
@@ -135,4 +135,3 @@ specification_version: 4
 summary: Pull events from a RabbitMQ exchange.
 test_files:
 - spec/inputs/rabbitmq_spec.rb
-has_rdoc: