amq-client 1.0.0.pre1 → 1.0.0.pre2

data/amq-client.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-protocol", ">= 0.9.0"
+  s.add_dependency "amq-protocol", ">= 0.9.4"
 
 
   # RubyForge

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

@@ -274,9 +274,15 @@ 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] || 3
+          @settings[:heartbeat] || @settings[:heartbeat_interval] || 0
         end # heartbeat_interval
 
+        # Returns true if heartbeats are enabled (heartbeat interval is greater than 0)
+        # @return [Boolean]
+        def heartbeats_enabled?
+          self.heartbeat_interval > 0
+        end
+
 
         # vhost this connection uses. Default is "/", a historically estabilished convention
         # of RabbitMQ and amqp gem.
@@ -529,10 +535,16 @@ module AMQ
         # @param [Array<AMQ::Protocol::Frame>] frames
         # @api plugin
         def receive_frameset(frames)
+          if self.heartbeats_enabled?
+            # treat incoming traffic as heartbeats.
+            # this operation is pretty expensive under heavy traffic but heartbeats can be disabled
+            # (and are also disabled by default). MK.
+            @last_server_heartbeat = Time.now
+          end
           frame = frames.first
 
-          if Protocol::HeartbeatFrame === frame
-            @last_server_heartbeat = Time.now
+          if AMQ::Protocol::HeartbeatFrame === frame
+            # no-op
           else
             if callable = AMQ::Client::HandlersRegistry.find(frame.method_class)
               f = frames.shift

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

@@ -173,9 +173,7 @@ module AMQ
           self.reset
           self.set_pending_connect_timeout((@settings[:timeout] || 3).to_f) unless defined?(JRUBY_VERSION)
 
-          if self.heartbeat_interval > 0
-            self.initialize_heartbeat_sender
-          end
+          self.initialize_heartbeat_sender if self.heartbeats_enabled?
         end # initialize(*args)
 
 

data/lib/amq/client/settings.rb

@@ -40,7 +40,8 @@ module AMQ
           # if you want to load broker-specific extensions
           :broker => nil,
 
-          :frame_max => 131072
+          :frame_max => 131072,
+          :heartbeat => 0
         }
       end
 

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "1.0.0.pre1"
+    VERSION = "1.0.0.pre2"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: -2724271480
+  hash: -1880058884
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - pre
-  - 1
-  version: 1.0.0.pre1
+  - 2
+  version: 1.0.0.pre2
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-22 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 51
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id002
 description: amq-client is a fully-featured, low-level AMQP 0.9.1 client with pluggable networking I/O adapters (EventMachine, cool.io, Eventpanda and so on) and supposed to back more opinionated AMQP clients (such as amqp gem) or be used directly in cases when access to more advanced AMQP 0.9.1 features is more important that convenient APIs
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-client
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client