bunny 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f980320596ae3eead897e92cb66d74c632a257
-  data.tar.gz: 6b3b92232fdced1f96c90d452136b3f46e1f6a42
+  metadata.gz: 14d586f46e53649e9c27b63b5607675dc839cc9e
+  data.tar.gz: fa41d53c74c60948e416ba3587e9b79e1facf2ba
 SHA512:
-  metadata.gz: 45314827e8cb6c002b78699925f78c07e68222ad3c7d7ff3bec9ccad9160285fd9a0bbbbac820acf8b54f11ce52671578b1c8f554db27233341784c65f399100
-  data.tar.gz: 303c9cee35b6ca65a1e15ce15cbaded1b82564b9749dba146da44f02f1bed7e7bc0564754ac6e00d619e7c06307d45d85a9908ccefce34d23272a1ab3aed99bb
+  metadata.gz: fa29c50cc14e1876594b664574a3948a4fec74643add577116a950f64da2ec079d4ca84347b59b16844f4f4a966b8b2ba9eb78d84b952977391ce6cefa0132f9
+  data.tar.gz: 9b7d163bd2ec192bb92c4e1e0700ecc0d72a14c57f0a05e4e425066f3132871dba0ebe8c746f50ff058f412888e673dd4bd0efd5e88ba86d02fe2da80db82e15

data/ChangeLog.md

@@ -1,3 +1,10 @@
+## Changes between Bunny 1.6.2 and 1.6.3
+
+### Socket Read Timeout No Longer Set to 0 With Disabled Heartbeats
+
+GH issue: [#267](https://github.com/ruby-amqp/bunny/pull/267).
+
+
 ## Changes between Bunny 1.6.1 and 1.6.2
 
 ### JRuby Writes Fixes

data/lib/bunny/session.rb

@@ -999,7 +999,13 @@ module Bunny
 
       # We set the read_write_timeout to twice the heartbeat value
       # This allows us to miss a single heartbeat before we time out the socket.
-      @transport.read_timeout = @heartbeat * 2
+      @transport.read_timeout = if heartbeat_disabled?(@client_heartbeat)
+                                  Transport::DEFAULT_READ_TIMEOUT
+                                else
+                                  # pad to account for edge cases. MK.
+                                  @heartbeat * 2.2
+                                end
+
 
       # if there are existing channels we've just recovered from
       # a network failure and need to fix the allocated set. See issue 205. MK.

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

data/spec/higher_level_api/integration/heartbeat_spec.rb

@@ -1,16 +1,34 @@
 require "spec_helper"
 
 describe "Client-defined heartbeat interval" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :heartbeat_interval => 4)
-    c.start
-    c
+  context "with value > 0" do
+    let(:connection) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :heartbeat_interval => 4)
+      c.start
+      c
+    end
+
+    it "can be enabled explicitly" do
+      sleep 5.0
+
+      connection.close
+    end
   end
 
-  it "can be enabled explicitly" do
-    sleep 5.0
+  # issue 267
+  context "with value = 0" do
+    let(:connection) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
+        :heartbeat_interval => 0, :automatically_recover => false)
+      c.start
+      c
+    end
 
-    connection.close
+    it "disables heartbeats" do
+      sleep 1.0
+
+      connection.close
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol