logstash-mixin-rabbitmq_connection 4.1.3-java → 4.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea336ab01162c3e3d4c52b822b3f843e857b5b9
-  data.tar.gz: 68df566879f34bcd6eef31590cb4ec5a982f20f4
+  metadata.gz: d69c8668720b7ebda212adced29bc3d12e49f574
+  data.tar.gz: 132c42eb041488be8e104ed56eb1768c95129b37
 SHA512:
-  metadata.gz: b5863c4c931266e1a7fa1f770236b82c714a943400e53da7242bb1e1761f6dc2920a14590eba8fbf88123f65c9570fd8ab868b9f4cc597dc4788e894eb7fca51
-  data.tar.gz: 1b9e2e6a31028ea37f6daa169384a6a572ac9dc3a0142e1fd7b3abee3ee36400c522b363ebc06ac1aabc2081810f41982a7ef995bcd99a2572e7d448f51978c1
+  metadata.gz: cc00581244fe0d5be9fd812d02ba202169fa90da128d2e70a4648994cfd55a74b13e2075e89fa2e2968f84a012925ffff7a01b37ccf1cc5dd926337c104fff6a
+  data.tar.gz: 15328dfa0dfbbc23fd7e6a0aa062abd2cd61bbd6c59a00e2e279fa8a66df42aceeb57b624ce8aed17b939435d5dcc421728e741e625bd94278186d26eacc10c8

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 4.2.0
+- Include URL of server when logging errors
+- Add warning log when connection is severed
 * 4.1.3
 - Bump march_hare version to 2.19.0 to fix reconnection failures with
   proxies. See

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -18,7 +18,7 @@ module LogStash
       end
 
       def setup_rabbitmq_connection_config
-        # RabbitMQ server address(es) 
+        # RabbitMQ server address(es)
         # host can either be a single host, or a list of hosts
         # i.e.
         #   host => "localhost"
@@ -201,9 +201,19 @@ module LogStash
 
         connection = MarchHare.connect(rabbitmq_settings)
 
-
-        connection.on_blocked { @logger.warn("RabbitMQ output blocked! Check your RabbitMQ instance!") }
-        connection.on_unblocked { @logger.warn("RabbitMQ output unblocked!") }
+        connection.on_shutdown do |conn, cause|
+           @logger.warn("RabbitMQ connection was closed!",
+                          :url => connection_url(conn),
+                          :automatic_recovery => @automatic_recovery,
+                          :cause => cause)
+        end
+        connection.on_blocked do
+          @logger.warn("RabbitMQ connection blocked! Check your RabbitMQ instance!",
+                       :url => connection_url(connection))
+        end
+        connection.on_unblocked do
+          @logger.warn("RabbitMQ connection unblocked!", :url => connection_url(connection))
+        end
 
         channel = connection.create_channel
         @logger.info("Connected to RabbitMQ at #{rabbitmq_settings[:host]}")
@@ -211,6 +221,13 @@ module LogStash
         HareInfo.new(connection, channel)
       end
 
+      # Mostly used for printing debug logs
+      def connection_url(connection)
+        user_pass = connection.user ? "#{connection.user}:XXXXXX@" : ""
+        protocol = params["ssl"] ? "amqps" : "amqp"
+        "#{protocol}://#{user_pass}#{connection.host}:#{connection.port}#{connection.vhost}"
+      end
+
       def sleep_for_retry
         Stud.stoppable_sleep(@connect_retry_interval) { @rabbitmq_connection_stopping }
       end

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '4.1.3'
+  s.version         = '4.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -96,6 +96,7 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       allow(connection).to receive(:create_channel).and_return(channel)
       allow(connection).to receive(:on_blocked)
       allow(connection).to receive(:on_unblocked)
+      allow(connection).to receive(:on_shutdown)
 
       instance.register
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: java
 authors:
 - Elastic