logstash-output-rabbitmq 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08471687f256720f2c7c35dbda03c185639848b
-  data.tar.gz: 2fa26fc00f0cafc76300787286ac0ae0f7ceaa53
+  metadata.gz: 196e13c70544a6e6b7429647f627d2909ca4b5df
+  data.tar.gz: 3e6871d57fdcb9afde9a531058728e0f57b252f8
 SHA512:
-  metadata.gz: 18bf67935083fc252e633b027883b5557b11822482357f1d10696f24650288e7a70b3e10dd21975d2fbdffab16bac1521c2be3eabbe46f916f750d19f71b7f68
-  data.tar.gz: e58ba7fcc3327a74c590ccdcc566f840e251cc32081a4b2c945d0590418e6ac94ff8c51a745f8181a51fe3359329cc67eb5ff1942b55f923439d60ae7943eb04
+  metadata.gz: 28810116ec622545494f279bb88107edf73e74d8f9886f533a8cf51c2e42dd096255ebcffbbefd8ae97b64031a024c6279128923280a53f5ad31e0b6c3fec87b
+  data.tar.gz: 4088c7f9ebdf63d9458effc176127df3c4fa3a8cd9acb6299d3e60ac47c4efb71f58935be1d49db8a341673bba6e29c5768f284e3a69871551b8938cd9ed4d62

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+* 1.0.1
+ - Fix connection leakage/failure to reconnect on disconnect

data/lib/logstash/outputs/rabbitmq/march_hare.rb

@@ -35,26 +35,28 @@ class LogStash::Outputs::RabbitMQ
     end
 
     def publish_serialized(event, message)
-      begin
-        if @connected.get
-          @x.publish(message, :routing_key => event.sprintf(@key), :properties => { :persistent => @persistent })
-        else
-          @logger.warn("Tried to send a message, but not connected to RabbitMQ.")
-        end
-      rescue MarchHare::Exception, IOError, com.rabbitmq.client.AlreadyClosedException => e
-        @connected.set(false)
-        n = 10
+      attempt_publish_serialized(event, message)
+    rescue MarchHare::Exception, IOError, com.rabbitmq.client.AlreadyClosedException => e
+      @connected.set(false)
+      n = 10
 
-        @logger.error("RabbitMQ connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...",
-                      :exception => e,
-                      :backtrace => e.backtrace)
-        return if terminating?
+      @logger.error("RabbitMQ connection error: #{e.message}. Will attempt to reconnect in #{n} seconds...",
+                    :exception => e,
+                    :backtrace => e.backtrace)
+      return if terminating?
 
-        sleep n
+      sleep n
 
-        connect
-        declare_exchange
-        retry
+      connect
+      @x = declare_exchange
+      retry
+    end
+
+    def attempt_publish_serialized(event, message)
+      if @connected.get
+        @x.publish(message, :routing_key => event.sprintf(@key), :properties => { :persistent => @persistent })
+      else
+        @logger.warn("Tried to send a message, but not connected to RabbitMQ.")
       end
     end
 
@@ -105,7 +107,7 @@ class LogStash::Outputs::RabbitMQ
       @connection_url        = "#{proto}://#{@user}@#{@host}:#{@port}#{vhost}/#{@queue}"
 
       begin
-        @conn = MarchHare.connect(@settings)
+        @conn = MarchHare.connect(@settings) unless @conn && @conn.open?
 
         @logger.debug("Connecting to RabbitMQ. Settings: #{@settings.inspect}, queue: #{@queue.inspect}")
 

data/logstash-output-rabbitmq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-rabbitmq'
-  s.version         = '1.0.0'
+  s.version         = '1.0.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"

data/spec/outputs/rabbitmq_spec.rb

@@ -69,4 +69,64 @@ describe LogStash::Outputs::RabbitMQ do
     end
 
   end
+
+  # TODO: Redo all this
+  # This is a crazy test to fix an urgent bug. It tests that we actually to change the
+  # store exchange value when an exception happens
+  # This should be a small number of lines, but until we refactor we must jump through hoops
+  # to put the plugin in the proper state and extract the proper state to test
+  describe "retrying a publish" do
+    let(:settings) {
+      {
+        "host" => "localhost",
+        "exchange_type" => "topic",
+        "exchange" => "foo",
+        "key" => "%{foo}"
+      }
+    }
+    let(:event) { LogStash::Event.new("foo" => "bar")}
+
+    subject { LogStash::Outputs::RabbitMQ.new(settings) }
+
+    before do
+      allow(subject).to receive(:connect) {
+                          subject.instance_variable_get(:@connected).set(true)
+                        }
+
+      exchange_invocation = 0
+
+      @most_recent_exchange = nil
+
+      allow(subject).to receive(:declare_exchange) do
+        exchange_invocation += 1
+        @most_recent_exchange = double("exchange #{exchange_invocation}")
+      end
+
+      subject.register
+    end
+
+    context "when the connection aborts once" do
+      before do
+        i = 0
+        allow(subject).to receive(:attempt_publish_serialized) do
+          i+=1
+          if i == 1 # Raise an exception once
+           raise MarchHare::Exception, "First"
+          else
+            "nope"
+          end
+        end
+
+        subject.publish_serialized(event, "hello")
+      end
+
+      it "should re-declare the exchange" do
+        expect(subject).to have_received(:declare_exchange).twice
+      end
+
+      it "should set the exchange to the second double" do
+        expect(subject.instance_variable_get(:@x)).to eql(@most_recent_exchange)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Push events to a RabbitMQ exchange