Disconnect on 'close'

lib/logstash/outputs/rabbitmq.rb

@@ -1,11 +1,11 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/pipeline"
-require "logstash/plugin_mixins/rabbitmq_connection/common"
+require "logstash/plugin_mixins/rabbitmq_connection"
 
 module LogStash
   module Outputs
     class RabbitMQ < LogStash::Outputs::Base
-      include LogStash::PluginMixins::RabbitMQConnection::Common
+      include LogStash::PluginMixins::RabbitMQConnection
 
       # Key to route to by default. Defaults to 'logstash'
       #
@@ -34,8 +34,6 @@ def publish(event, message)
         raise ArgumentError, "No exchange set in HareInfo!!!" unless @hare_info.exchange
         @hare_info.exchange.publish(message, :routing_key => event.sprintf(@key), :properties => { :persistent => @persistent })
       rescue MarchHare::Exception, IOError, com.rabbitmq.client.AlreadyClosedException => e
-        return if terminating?
-
         @logger.error("Error while publishing. Will retry.",
                       :message => e.message,
                       :exception => e.class,
@@ -44,6 +42,11 @@ def publish(event, message)
         sleep_for_retry
         retry
       end
+
+      def stop
+        super
+        close_connection
+      end
     end
   end
 end