sensu-transport 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b9ba8afea750781d43f20d3de693c60a5ed8e7
-  data.tar.gz: ee1c66ecc741e51eb086f4d6e5c5aac697aa34f0
+  metadata.gz: 453c7441cdd99a8ac5db0aa1a73bf2122ecd628d
+  data.tar.gz: 9fa00ddc17d02956b06983109ab190e5290a4fe8
 SHA512:
-  metadata.gz: 3d2d961080526f7b12339de85c3c8adb8fcaa0f917955808d30ed1b6063345bfd73109a8df1d41ecc5a71c734aabf0fa2f4693ef018df1a575011dd811cc618d
-  data.tar.gz: c1b07142538c8ef5176f8e4ace1efab014c3a50ac1b7d91175cbf477384cf98250666f43409c6942c4cbf06d7b5e8d4ec1016859f7debda073e77b60f49eb207
+  metadata.gz: 0e50c0f00787c8764fc01e0ef2afed3f15cc7fbf18c1ca16919c82f4a3461f7e56e4eb697ab3d2bc94536e2b344ce42b3f3d50a0f9068a7b95a0d711a8bd65ff
+  data.tar.gz: 088f59bf49ce59e4b8f5ce3adacb34ff31828d15b8f23b9084c2e0b6b849af2c707f719c75a7496f338b749e7d191836e0eb1ecd0cfc7e5cd733f80187ababca

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+vendor

data/lib/sensu/transport/rabbitmq.rb

@@ -1,4 +1,4 @@
-gem "amqp", "1.3.0"
+gem "amqp", "1.5.0"
 
 require "amqp"
 
@@ -7,40 +7,28 @@ require File.join(File.dirname(__FILE__), "base")
 module Sensu
   module Transport
     class RabbitMQ < Base
-      def initialize
-        super
-        @queues = {}
-      end
-
       def connect(options={})
+        reset
+        set_connection_options(options)
         create_connection_timeout
-        @connection = AMQP.connect(options, {
-          :on_tcp_connection_failure => on_connection_failure,
-          :on_possible_authentication_failure => on_connection_failure
-        })
-        @connection.logger = @logger
-        @connection.on_open do
-          @connection_timeout.cancel
-        end
-        reconnect_callback = Proc.new { reconnect }
-        @connection.on_tcp_connection_loss(&reconnect_callback)
-        @connection.on_skipped_heartbeats(&reconnect_callback)
-        setup_channel(options)
+        connect_with_eligible_options
       end
 
       def reconnect
-        unless @connection.reconnecting?
-          @connection_timeout.cancel
+        unless @reconnecting
+          @reconnecting = true
           @before_reconnect.call
+          reset
           timer = EM::PeriodicTimer.new(5) do
-            begin
-              @connection.reconnect(true)
-            rescue EventMachine::ConnectionError
+            unless connected?
+              connect_with_eligible_options do
+                @reconnecting = false
+                @after_reconnect.call
+              end
+            else
+              timer.cancel
             end
           end
-          @connection.on_recovery do
-            timer.cancel
-          end
         end
       end
 
@@ -108,18 +96,46 @@ module Sensu
 
       private
 
+      def reset
+        @queues = {}
+        @connection_timeout.cancel if @connection_timeout
+        @connection.close_connection if @connection
+      end
+
+      def set_connection_options(options)
+        @connection_options = Array(options)
+      end
+
       def create_connection_timeout
         @connection_timeout = EM::Timer.new(20) do
-          error = Error.new("timed out while attempting to connect to rabbitmq")
-          @on_error.call(error)
+          reconnect
         end
       end
 
-      def on_connection_failure
-        Proc.new do
-          error = Error.new("failed to connect to rabbitmq")
-          @on_error.call(error)
+      def next_connection_options
+        if @eligible_options.nil? || @eligible_options.empty?
+          @eligible_options = @connection_options.shuffle
+        end
+        @eligible_options.shift
+      end
+
+      def reconnect_callback
+        Proc.new { reconnect }
+      end
+
+      def connect_with_eligible_options(&callback)
+        options = next_connection_options
+        @connection = AMQP.connect(options)
+        @connection.on_tcp_connection_failure(&reconnect_callback)
+        @connection.on_possible_authentication_failure(&reconnect_callback)
+        @connection.logger = @logger
+        @connection.on_open do
+          @connection_timeout.cancel
+          callback.call if callback
         end
+        @connection.on_tcp_connection_loss(&reconnect_callback)
+        @connection.on_skipped_heartbeats(&reconnect_callback)
+        setup_channel(options)
       end
 
       def setup_channel(options={})
@@ -134,9 +150,6 @@ module Sensu
           prefetch = options.fetch(:prefetch, 1)
         end
         @channel.prefetch(prefetch)
-        @channel.on_recovery do
-          @after_reconnect.call
-        end
       end
     end
   end

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "1.0.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu transport abstraction library"
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("sensu-em")
-  spec.add_dependency("amqp", "1.3.0")
+  spec.add_dependency("amqp", "1.5.0")
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-em
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Sensu transport abstraction library
@@ -156,3 +156,4 @@ test_files:
 - spec/helpers.rb
 - spec/rabbitmq_spec.rb
 - spec/transport_spec.rb
+has_rdoc: