amq-client 0.9.8 → 0.9.9

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

@@ -274,13 +274,13 @@ module AMQ
         # @return  [Fixnum]  Heartbeat interval this client uses, in seconds.
         # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.4.2.6)
         def heartbeat_interval
-          @settings[:heartbeat] || @settings[:heartbeat_interval] || 0
+          @heartbeat_interval
         end # heartbeat_interval
 
         # Returns true if heartbeats are enabled (heartbeat interval is greater than 0)
         # @return [Boolean]
         def heartbeats_enabled?
-          self.heartbeat_interval > 0
+          @heartbeat_interval && (@heartbeat_interval > 0)
         end
 
 
@@ -608,10 +608,13 @@ module AMQ
         #
         # @api plugin
         # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.4.2.6)
-        def handle_tune(tune_ok)
-          @channel_max        = tune_ok.channel_max.freeze
-          @frame_max          = tune_ok.frame_max.freeze
-          @heartbeat_interval = self.heartbeat_interval || tune_ok.heartbeat
+        def handle_tune(connection_tune)
+          @channel_max        = connection_tune.channel_max.freeze
+          @frame_max          = connection_tune.frame_max.freeze
+
+          client_heartbeat    = @settings[:heartbeat] || @settings[:heartbeat_interval] || 0
+
+          @heartbeat_interval = negotiate_heartbeat_value(client_heartbeat, connection_tune.heartbeat)
 
           self.send_frame(Protocol::Connection::TuneOk.encode(@channel_max, [settings[:frame_max], @frame_max].min, @heartbeat_interval))
         end # handle_tune(method)
@@ -652,6 +655,14 @@ module AMQ
 
         protected
 
+        def negotiate_heartbeat_value(client_value, server_value)
+          if client_value == 0 || server_value == 0
+            [client_value, server_value].max
+          else
+            [client_value, server_value].min
+          end
+        end
+
         # Returns next frame from buffer whenever possible
         #
         # @api private

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

@@ -267,7 +267,7 @@ module AMQ
           @handling_skipped_hearbeats        = false
           @last_server_heartbeat             = Time.now
 
-          self.initialize_heartbeat_sender if self.heartbeat_interval > 0
+          self.initialize_heartbeat_sender if heartbeats_enabled?
 
           self.handshake
         end

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "0.9.8"
+    VERSION = "0.9.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-client
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease:
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine