right_amqp 0.5.2 → 0.6.0

data/lib/right_amqp/amqp/client.rb

@@ -247,13 +247,7 @@ module AMQP
     def reconnect force = false
       if @reconnecting and not force
         # Wait after first reconnect attempt and in between each subsequent attempt
-        EM.add_timer(@settings[:reconnect_interval] || 5) do
-          begin
-            reconnect(true)
-          rescue Exception => e
-            logger.exception("[amqp] Failed to reconnect", e, :trace)
-          end
-        end
+        EM.add_timer(@settings[:reconnect_interval] || 5) { reconnect(true) }
         return
       end
 
@@ -271,13 +265,7 @@ module AMQP
         again = again.call if again.is_a?(Proc)
         if again.is_a?(Numeric)
           # Wait before making initial reconnect attempt
-          EM.add_timer(again) do
-            begin
-              reconnect(true)
-            rescue Exception => e
-              logger.exception("[amqp] Failed to reconnect", e, :trace)
-            end
-          end
+          EM.add_timer(again) { reconnect(true) }
           return
         elsif ![nil, true].include?(again)
           raise ::AMQP::Error, "Could not interpret :reconnect_delay => #{again.inspect}; expected nil, true, or Numeric"
@@ -287,6 +275,9 @@ module AMQP
       log 'reconnecting'
       logger.info("[amqp] Attempting to reconnect to #{@settings[:identity]}")
       EM.reconnect(@settings[:host], @settings[:port], self)
+    rescue Exception => e
+      logger.exception("[amqp] Failed to reconnect", e, :trace)
+      failed
     end
 
     def self.connect opts = {}
@@ -300,14 +291,14 @@ module AMQP
 
     def failed
       @connection_status.call(:failed) if @connection_status
-      @failed = true
+      @has_failed = true
       close_connection
     end
 
     private
 
     def disconnected
-      unless @failed
+      unless @has_failed
         @connection_status.call(:disconnected) if @connection_status
         reconnect
       end

data/right_amqp.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_amqp'
-  spec.version   = '0.5.2'
-  spec.date      = '2012-09-27'
+  spec.version   = '0.6.0'
+  spec.date      = '2012-12-10'
   spec.authors   = ['Lee Kirchhoff']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_amqp'
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', ['>= 1.2', '< 3.0'])
-  spec.add_dependency('eventmachine', '~> 0.12.10')
+  spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
 
   spec.description = <<-EOF
 RightAMQP provides a high availability client for interfacing with the

data/spec/amqp/client_extensions_spec.rb

@@ -33,7 +33,7 @@ describe AMQP::Client do
     class SUT
       include AMQP::Client
 
-      attr_accessor :reconnecting, :settings, :channels
+      attr_accessor :reconnecting, :settings, :channels, :has_failed
     end
 
     before(:each) do
@@ -88,7 +88,7 @@ describe AMQP::Client do
       end
     end
 
-    context 'with a :reconnect_interval of 5 seconds'  do
+    context 'with a :reconnect_interval of 5 seconds' do
       it 'should schedule reconnect attempts on a 5s interval' do
         @sut.reconnecting = true
         @sut.settings[:reconnect_delay] = 15
@@ -101,6 +101,17 @@ describe AMQP::Client do
       end
     end
 
+    context 'with a reconnect failure' do
+      it 'should fail the connection' do
+        @logger.should_receive(:error).with(/Failed to reconnect/).once
+        flexmock(EM).should_receive(:reconnect).and_raise(Exception).once
+        flexmock(@sut).should_receive(:close_connection).once
+
+        @sut.reconnect()
+        @sut.has_failed.should be_true
+      end
+    end
+
   end
 
   context "heartbeat" do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_amqp
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.2
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -10,33 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 Z
+date: 2012-12-10 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: right_support
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
-  type: :runtime
+  requirement: *id001
+  name: right_support
   prerelease: false
-  version_requirements: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-  type: :runtime
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  requirement: *id002
+  name: eventmachine
   prerelease: false
-  version_requirements: *id002
+  type: :runtime
 description: |
   RightAMQP provides a high availability client for interfacing with the
   RightScale RabbitMQ broker using the AMQP protocol. The AMQP version on which
@@ -86,6 +112,7 @@ files:
 - spec/ha_client/ha_broker_client_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/rightscale/right_amqp
 licenses: []
 
@@ -102,20 +129,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2478325882145006722
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client for interfacing to RightScale RabbitMQ broker using AMQP