brontes3d-amqp 0.6.4.0 → 0.6.4.1

data/amqp.gemspec

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

data/bacon/client.rb

@@ -197,4 +197,37 @@ describe Client do
       ["nonexistanthost", 5672], ["alsononexistant", 5672]]
   end
   
+  should "handle redirect requests" do
+    EventMachine.stubs(:connect_server).returns(99).with do |arg1, arg2| 
+      EM.next_tick do
+        @client = EM.class_eval{ @conns }[99]
+        @client.stubs(:send_data).returns(true)
+        @client.connection_completed
+        payload = AMQP::Protocol::Connection::Redirect.new(
+                        :known_hosts => "nonexistanthost:5672,otherhost:5672",
+                        :host => 'otherhost:5672')
+        meth = AMQP::Frame::Method.new
+        meth.payload = payload
+        @client.process_frame meth
+        EM.next_tick do
+          EM.class_eval{ @conns.delete(99) }
+          @client.unbind
+        end
+      end
+      true
+    end
+    
+    @re_connect_args = []
+    EventMachine.stubs(:reconnect).returns(true).with do |arg1, arg2| 
+      @re_connect_args << [arg1, arg2]
+    end
+    
+    EM.next_tick{ EM.add_timer(0.5){ EM.stop_event_loop } }
+    
+    AMQP.start(:host => 'nonexistanthost', :reconnect_timer => 0.1)
+    
+    @re_connect_args.should == [["otherhost", 5672]]
+  end
+  
+  
 end

data/lib/amqp/client.rb

@@ -35,6 +35,16 @@ module AMQP
         when Protocol::Connection::OpenOk
           succeed(self)
 
+        when Protocol::Connection::Redirect
+          (redir_host, redir_port) = method.host.split(":")
+          redir_port = redir_port.to_i #important!
+          STDERR.puts "Redirecting to #{redir_host}:#{redir_port}"
+          old_on_disconnect = @on_disconnect
+          @on_disconnect = Proc.new do
+            @on_disconnect = old_on_disconnect
+            reconnect true, redir_host, redir_port
+          end
+          
         when Protocol::Connection::Close
           # raise Error, "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]}"
           STDERR.puts "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]}"
@@ -161,7 +171,7 @@ module AMQP
       }
     end
 
-    def reconnect force = false
+    def reconnect force = false, use_host = nil, use_port = nil
       if @reconnecting and not force
         # wait 1 second after first reconnect attempt, in between each subsequent attempt
         EM.add_timer(@settings[:reconnect_timer] || 1){ reconnect(true) }
@@ -181,9 +191,15 @@ module AMQP
 
       log 'reconnecting'
       begin
-        (try_host, try_port) = Client.determine_reconnect_server(@settings)
+        if use_host && use_port
+          (try_host, try_port) = [use_host, use_port]
+        else
+          (try_host, try_port) = Client.determine_reconnect_server(@settings)
+          STDERR.puts "Reconnecting to #{try_host}:#{try_port}"          
+        end
         EM.reconnect try_host, try_port, self
       rescue RuntimeError => e
+        STDERR.puts "'#{e.message}' on reconnect to #{try_host}:#{try_port}"
         return reconnect if e.message == "no connection"
         raise e
       end
@@ -212,6 +228,7 @@ module AMQP
         (try_host, try_port) = determine_reconnect_server(opts)
         EM.connect try_host, try_port, self, opts
       rescue RuntimeError => e
+        STDERR.puts "'#{e.message}' on connect to #{try_host}:#{try_port}"
         retry if e.message == "no connection" && @retry_count < max_retry
         raise e
       end

metadata

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