amq-client 0.8.1 → 0.8.2

data/.travis.yml

@@ -5,7 +5,6 @@ before_script: ./bin/ci/before_build.sh
 rvm:
   - jruby
   - 1.8.7
-  - 1.8.7-p249
   - rbx-2.0
   - 1.9.2
   - 1.9.3

data/lib/amq/client/async/adapter.rb

@@ -442,6 +442,20 @@ module AMQ
         end # start_automatic_recovery
 
 
+        # Defines a callback that will be executed after time since last broker heartbeat is greater
+        # than or equal to the heartbeat interval (skipped heartbeat is detected).
+        # Only one callback can be defined (the one defined last replaces previously added ones).
+        #
+        # @api public
+        def on_skipped_heartbeats(&block)
+          self.redefine_callback(:skipped_heartbeats, &block)
+        end # on_skipped_heartbeats(&block)
+
+        # @private
+        def run_skipped_heartbeats_callbacks
+          self.exec_callback_yielding_self(:skipped_heartbeats, @settings)
+        end
+
         # @endgroup
 
 
@@ -528,10 +542,10 @@ module AMQ
         # Sends a heartbeat frame if connection is open.
         # @api plugin
         def send_heartbeat
-          if tcp_connection_established?
-            if @last_server_heartbeat < (Time.now - (self.heartbeat_interval * 2))
-              logger.error "Reconnecting due to missing server heartbeats"
-              # TODO: reconnect
+          if tcp_connection_established? && !@handling_skipped_hearbeats
+            if @last_server_heartbeat < (Time.now - (self.heartbeat_interval * 2)) && !reconnecting?
+              logger.error "[amqp] Detected missing server heartbeats"
+              self.handle_skipped_hearbeats
             end
             send_frame(Protocol::HeartbeatFrame)
           end

data/lib/amq/client/async/adapters/coolio.rb

@@ -274,6 +274,11 @@ module AMQ
           AMQ::Client::TCPConnectionFailed
         end # self.tcp_connection_failure_exception_class
 
+        def handle_skipped_hearbeats
+          # TODO
+        end
+
+
         protected
 
         # @api private
@@ -291,7 +296,8 @@ module AMQ
 
           # now we can set it. MK.
           @had_successfully_connected_before = true
-          @reconnecting                     = false
+          @reconnecting                      = false
+          @handling_skipped_hearbeats        = false
 
           self.reset
           self.handshake

data/lib/amq/client/async/adapters/event_machine.rb

@@ -173,8 +173,7 @@ module AMQ
           self.set_pending_connect_timeout((@settings[:timeout] || 3).to_f) unless defined?(JRUBY_VERSION)
 
           if self.heartbeat_interval > 0
-            @last_server_heartbeat = Time.now
-            EventMachine.add_periodic_timer(self.heartbeat_interval, &method(:send_heartbeat))
+            self.initialize_heartbeat_sender
           end
         end # initialize(*args)
 
@@ -265,7 +264,11 @@ module AMQ
 
           # now we can set it. MK.
           @had_successfully_connected_before = true
-          @reconnecting                     = false
+          @reconnecting                      = false
+          @handling_skipped_hearbeats        = false
+          @last_server_heartbeat             = Time.now
+
+          self.initialize_heartbeat_sender if self.heartbeat_interval > 0
 
           self.handshake
         end
@@ -287,6 +290,7 @@ module AMQ
         def unbind(exception = nil)
           if !@tcp_connection_established && !@had_successfully_connected_before && !@intentionally_closing_connection
             @tcp_connection_failed = true
+            logger.error "[amqp] Detected TCP connection failure"
             self.tcp_connection_failed
           end
 
@@ -346,7 +350,24 @@ module AMQ
           closed!
         end # disconnection_successful
 
+        # Called when time since last server heartbeat received is greater or equal to the
+        # heartbeat interval set via :heartbeat_interval option on connection.
+        #
+        # @api plugin
+        def handle_skipped_hearbeats
+          if !@handling_skipped_hearbeats && @tcp_connection_established && !@intentionally_closing_connection
+            @handling_skipped_hearbeats = true
+            @heartbeats_timer.cancel
 
+            self.run_skipped_heartbeats_callbacks
+          end
+        end
+
+        # @private
+        def initialize_heartbeat_sender
+          @last_server_heartbeat = Time.now
+          @heartbeats_timer      = EventMachine::PeriodicTimer.new(self.heartbeat_interval, &method(:send_heartbeat))
+        end
 
 
 

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +04:00
+date: 2011-08-28 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency