brontes3d-amqp 0.6.4.1 → 0.6.4.2

data/amqp.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'amqp'
-  s.version = '0.6.4.1'
+  s.version = '0.6.4.2'
   s.date = '2009-01-09'
   s.summary = 'AMQP client implementation in Ruby/EventMachine'
   s.email = "amqp@tmm1.net"

data/bacon/client.rb

@@ -13,6 +13,7 @@ describe Client do
     AMQP.instance_eval{ @conn = nil }
     AMQP.instance_eval{ @closing = false }
     Client.class_eval{ @retry_count = 0 }
+    Client.class_eval{ @server_to_select = 0 }
   end
   
   should 'reconnect on disconnect after connection_completed (use reconnect_timer)' do
@@ -229,5 +230,52 @@ describe Client do
     @re_connect_args.should == [["otherhost", 5672]]
   end
   
+  should "respect max_retry if the disconnect happens before connection completes" do
+    @times_connected = 0
+  
+    EventMachine.stubs(:connect_server).returns(99).with do |arg1, arg2| 
+      @times_connected += 1
+      EM.next_tick do
+        @client = EM.class_eval{ @conns }[99]
+        @client.stubs(:send_data).returns(true)
+        EM.class_eval{ @conns.delete(99) }
+        @client.unbind
+      end
+      true
+    end
+    
+    EM.next_tick{ EM.add_timer(0.5){ EM.stop_event_loop } }
+    
+    #connect
+    lambda{
+      AMQP.start(:host => 'nonexistanthost', :reconnect_timer => 0.01, :max_retry => 6)
+    }.should.raise(RuntimeError)
+    # puts "\nreconnected #{@times_connected} times"
+    @times_connected.should == 7
+  end
+  
+  should "reset connection count if the disconnect happens after connection completes" do
+    @times_connected = 0
+  
+    EventMachine.stubs(:connect_server).returns(99).with do |arg1, arg2| 
+      @times_connected += 1
+      EM.next_tick do
+        @client = EM.class_eval{ @conns }[99]
+        @client.stubs(:send_data).returns(true)
+        @client.connection_completed
+        EM.class_eval{ @conns.delete(99) }
+        @client.unbind
+      end
+      true
+    end
+    
+    EM.next_tick{ EM.add_timer(0.5){ EM.stop_event_loop } }
+    
+    #connect
+    AMQP.start(:host => 'nonexistanthost', :reconnect_timer => 0.01, :max_retry => 6)      
+    # puts "\nreconnected #{@times_connected} times"
+    @times_connected.should > 7
+  end
+  
   
 end

data/lib/amqp/client.rb

@@ -85,6 +85,7 @@ module AMQP
       log 'connected'
       # @on_disconnect = proc{ raise Error, 'Disconnected from server' }
       unless @closing
+        Client.connection_succeeded!
         @on_disconnect = method(:disconnected)
       end
 
@@ -209,17 +210,26 @@ module AMQP
       try_host = opts[:host]
       try_port = opts[:port]
       @retry_count ||= 0
+      if opts[:max_retry] && @retry_count >= opts[:max_retry]
+        raise "max_retry (#{@retry_count}) reached, disconnecting"
+      end
       if srv_list = opts[:fallback_servers]
-        idex = @retry_count % (srv_list.size + 1)
+        @server_to_select ||= 0
+        idex = @server_to_select % (srv_list.size + 1)
         if idex != 0
           try = srv_list[idex - 1]
           try_host = try[:host] || AMQP.settings[:host]
           try_port = try[:port] || AMQP.settings[:port]
         end
-      end
+        @server_to_select += 1
+      end      
       @retry_count += 1
       [try_host, try_port]
     end
+    
+    def self.connection_succeeded!
+      @retry_count = 0
+    end
 
     def self.connect opts = {}
       opts = AMQP.settings.merge(opts)
@@ -227,6 +237,7 @@ module AMQP
       begin
         (try_host, try_port) = determine_reconnect_server(opts)
         EM.connect try_host, try_port, self, opts
+        connection_succeeded!
       rescue RuntimeError => e
         STDERR.puts "'#{e.message}' on connect to #{try_host}:#{try_port}"
         retry if e.message == "no connection" && @retry_count < max_retry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brontes3d-amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.4.1
+  version: 0.6.4.2
 platform: ruby
 authors: 
 - Aman Gupta
@@ -94,7 +94,6 @@ files:
 - bacon/client.rb
 has_rdoc: true
 homepage: http://amqp.rubyforge.org/
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --include=examples
@@ -115,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: AMQP client implementation in Ruby/EventMachine