sensu-transport 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e2efea48fe1374767d24f2bf1fe5e196e84b2e
-  data.tar.gz: 6175da2fa7df37256fc506f350e8c210220027ff
+  metadata.gz: b2445b981319329c16442ba79d0cf1bd2e2d07a3
+  data.tar.gz: 5e2c041d677ae778193b4b9c2c5983e5cec0dad7
 SHA512:
-  metadata.gz: 553bd1fd716d1e9d4db0d8e1c6bec9ffd8979dfe9052516c4a24356100184a66851b1d6aed00a00a36096aa64961c1b9ce8390a3a510bcffe1f4cb741e579dd5
-  data.tar.gz: d21146d0ffbaf397dee465dae275cf9af269dc13892c276e6544faeeb7562c72c4d1d1570c4139acc33e2fe88b0b8b4980dead7b46bd9f150f3184d6535b6bd8
+  metadata.gz: e61049fd3510dc58237c842d2f71f5f86381695a5380ce9ef6bb64a5d087aa5fd5f1accbc8e852f014eb4799649fed54d03096b4aedc170114db0abb35d19d8c
+  data.tar.gz: ad9bcaa6d5fbd8f08ed8093f168f362c10ebf4b25e26c80f5c264491a9e68cd1bc3a39899f72b8707f557f98682c508d8b56525f28005bfd89618b0e657ddff6

data/lib/sensu/transport/rabbitmq.rb

@@ -19,16 +19,7 @@ module Sensu
           @reconnecting = true
           @before_reconnect.call
           reset
-          timer = EM::PeriodicTimer.new(5) do
-            unless connected?
-              connect_with_eligible_options do
-                @reconnecting = false
-                @after_reconnect.call
-              end
-            else
-              timer.cancel
-            end
-          end
+          periodically_reconnect
         end
       end
 
@@ -123,13 +114,7 @@ module Sensu
         Proc.new { reconnect }
       end
 
-      def connection_error(error)
-        @logger.error("[amqp] Detected TCP connection failure: #{error}") if @logger
-        reconnect
-      end
-
-      def connect_with_eligible_options(&callback)
-        options = next_connection_options
+      def setup_connection(options={}, &callback)
         @connection = AMQP.connect(options)
         @connection.on_tcp_connection_failure(&reconnect_callback)
         @connection.on_possible_authentication_failure(&reconnect_callback)
@@ -140,11 +125,6 @@ module Sensu
         end
         @connection.on_tcp_connection_loss(&reconnect_callback)
         @connection.on_skipped_heartbeats(&reconnect_callback)
-        setup_channel(options)
-      rescue EventMachine::ConnectionError => error
-        connection_error(error)
-      rescue Java::JavaLang::RuntimeException => error
-        connection_error(error)
       end
 
       def setup_channel(options={})
@@ -160,6 +140,29 @@ module Sensu
         end
         @channel.prefetch(prefetch)
       end
+
+      def connect_with_eligible_options(&callback)
+        options = next_connection_options
+        setup_connection(options, &callback)
+        setup_channel(options)
+      end
+
+      def periodically_reconnect
+        timer = EM::PeriodicTimer.new(5) do
+          unless connected?
+            begin
+              connect_with_eligible_options do
+                @reconnecting = false
+                @after_reconnect.call
+              end
+            rescue EventMachine::ConnectionError
+            rescue Java::JavaLang::RuntimeException
+            end
+          else
+            timer.cancel
+          end
+        end
+      end
     end
   end
 end

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "2.2.0"
+  spec.version       = "2.3.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu transport abstraction library"

data/spec/rabbitmq_spec.rb

@@ -108,11 +108,11 @@ describe "Sensu::Transport::RabbitMQ" do
     end
   end
 
-  it "can handle eventmachine connection errors" do
+  it "will throw an error if it cannot resolve a hostname" do
     async_wrapper do
       expect {
         @transport.connect(:host => "2def33c3-cfbb-4993-b5ee-08d47f6d8793")
-      }.not_to raise_error
+      }.to raise_error
       async_done
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sean Porter