bunny 2.13.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbe2d738194816f84deb5451620f03964043b78c5946cf21100553a05eb8c7e
-  data.tar.gz: f04991e27bfdc2b955996e64961426089cdbda120f9cf1bf50966cf139d3907a
+  metadata.gz: 656044a49b0519951d33968f7a0fd45e5fd34e7e11390204368ca2c044e1a32e
+  data.tar.gz: 6a3235983cd9614cafc653985dc65eb99b525e3019380d3b06c235f7d0b2db06
 SHA512:
-  metadata.gz: aadf2c5075bba016a202c2ab936b82dd0b14bed7ffcade9cf9699b3580de85a59832de0eaf283facd01dcec1b89dd635277ea14c8d088a28fb8bf16430dbce1b
-  data.tar.gz: 95e47f4fd4e5901bd1f9747623534ce4c060c820b085c6803e73c3ec7363117a08763312725951169c1f8feea98294961c32215f956093febcebee6cd8e5bc34
+  metadata.gz: d7072cf0f324b6455ca955c8622c1b1811f8b4554ef01ca87c5c31eb1d4ae39f9674433478ce180704130dd143798a95c65d944182a6faee4789ea72cfb64727
+  data.tar.gz: dbf6d87e2a7bc49efb13661463458477b547f5f3044933416684f770208b62d5c73c9b47bf60f863c7a00d66e45a5d2d357a6243de2230d64b0ace81976a7ed7

data/.gitignore

@@ -11,7 +11,7 @@ Gemfile.lock
 .tags
 .tags_sorted_by_file
 .Apple*
-bin/*
+/bin/*
 .bundle/*
 vendor/*
 playground/*

data/.travis.yml

@@ -3,14 +3,17 @@ bundler_args: --without development
 cache: bundler
 before_install:
   - gem install bundler
-before_script: "./bin/ci/before_build"
+before_script:
+  - "./bin/ci/install_on_debian.sh"
+  - until sudo lsof -i:5672; do echo "Waiting for RabbitMQ to start..."; sleep 1; done
+  - "./bin/ci/before_build.sh"
 script: "bundle exec rake integration_without_recovery"
 rvm:
   - ruby-head
+  - "2.6.0"
   - "2.5.1"
   - "2.4.2"
   - "2.3.5"
-  - "2.2.8"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -18,8 +21,8 @@ services:
 branches:
   only:
     - master
-    - 2.9.x-stable
-    - 2.8.x-stable
+    - 2.12.x-stable
+    - 2.11.x-stable
 env:
   - CI=true
 matrix:

data/CONTRIBUTING.md

@@ -6,10 +6,10 @@ Issues are appropriate for something specific enough for a maintainer or contrib
  * There should be enough information to reproduce the behavior observed in a reasonable amount of time
  * It should be reasonably clear why the behavior should be changed and why this cannot or should not be addressed
    in application code, a separate library and so on
-   
+
  All issues that do not satisfy the above properties belong to the [Ruby RabbitMQ clients mailing list](http://groups.google.com/forum/#!forum/ruby-amqp). Pull request that do not satisfy them have a high chance
  of being closed.
- 
+
 ## Submitting a Pull Request
 
 Please read the sections below to get an idea about how to run Bunny test suites first. Successfully
@@ -27,44 +27,47 @@ locally with the `rabbitmq-management` and `rabbitmq_consistent_hash_exchange` p
 
 ### Running the Specs
 
-The specs require RabbitMQ to be running locally with a specific set of vhosts
+The specs require RabbitMQ to be running locally with a specific set of virtual hosts
 and users. RabbitMQ can be provisioned and started any way that's convenient to you
 as long as it has a suitable TLS keys configuration and management plugin enabled.
-Make sure you have a recent version of RabbitMQ (> `3.5.3`).
+Make sure you have a recent version of RabbitMQ (> `3.7.10`).
 
-You can also start a clean RabbitMQ server
-node on your machine specifically for the bunny specs.
-This can be done either by using a locally installed RabbitMQ server or by
-running a RabbitMQ server in a Docker container.
+The test suite can either use a locally available RabbitMQ node ([generic binary builds](http://www.rabbitmq.com/install-generic-unix.html)
+are an option that works well) or by running a RabbitMQ server in a Docker container.
 
-#### Using a locally installed RabbitMQ server
+### Using a locally installed RabbitMQ node
 
 It is possible to start a local RabbitMQ node from the repository root. It is not necessarily
 optimal but can be a good starting point but is a useful example:
 
 ```
-RABBITMQ_NODENAME=bunny RABBITMQ_CONFIG_FILE=./spec/config/rabbitmq RABBITMQ_ENABLED_PLUGINS_FILE=./spec/config/enabled_plugins rabbitmq-server
+RABBITMQ_NODENAME=bunny RABBITMQ_CONFIG_FILE=./spec/config/rabbitmq.conf RABBITMQ_ENABLED_PLUGINS_FILE=./spec/config/enabled_plugins rabbitmq-server
 ```
 
-The specs use the RabbitMQ management plugin and require a TLS port to
-be available. The config files in the spec/config directory enable
-these. TLS (x509 PEM) certificates include a hostname-specific fields,
-the tests allow for expecting hostname overriding using the `BUNNY_RABBITMQ_HOSTNAME`
-environment variables (default value is `127.0.0.1`).
+The specs need the RabbitMQ management plugin to be enabled and include TLS connectivity tests,
+so the node must be configured to use a [certificate and key pair](http://www.rabbitmq.com/ssl.html#certificates-and-keys).
+The config and enabled plugin files in the spec/config directory take care of that
+but certificates must be provisioned locally. By default there's a set of CA, server, and client certificates pre-generated at `spec/tls`.
+
+The `BUNNY_CERTIFICATE_DIR` environment variable can be used to a directory containing a CA certificate
+and a certificate/key pair to be used by the server. The directory can be generated using
+[tls-gen](https://github.com/michaelklishin/tls-gen)'s basic profile. This option is recommended.
 
-By default there's a set of CA, server, and client certificates pre-generated at `spec/tls`. Since x509 certificates
-contain a hardcoded CN and your hostname is unlikely to match it,
-the location can be overridden via the `BUNNY_CERTIFICATE_DIR` environment variable.
-It is supposed to target [tls-gen](https://github.com/michaelklishin/tls-gen)'s basic profile
-output (result) directory on the host where specs are to be executed. Combine it with `BUNNY_RABBITMQ_HOSTNAME`
-when running TLS connection tests:
+`BUNNY_RABBITMQ_HOSTNAME` can be used to override the expected server hostname for [peer verification](http://www.rabbitmq.com/ssl.html#peer-verification) in the TLS test suite:
 
 ```
 BUNNY_CERTIFICATE_DIR="/path/to/tls-gen/basic/result" BUNNY_RABBITMQ_HOSTNAME="mayflower" bundle exec rspec
 
 ```
 
-Next up you'll need to prepare your node for the specs (just once):
+Certificates can be generated with [tls-gen](https://github.com/michaelklishin/tls-gen)'s basic profile.
+In that case they include a Subject Alternative Name of `localhost` for improved portability.
+
+
+### Node Setup
+
+There is also a script that preconfigured the node for Bunny tests. It is sufficient to run
+it once but if RabbitMQ is reset it has to be executed again:
 
 ```
 RABBITMQ_NODENAME=bunny ./bin/ci/before_build
@@ -90,19 +93,29 @@ Version >= 1.6.0+ is required for compose version 2 syntax.
 After those have been installed (and the `docker-compose` command is available on your command line path), run
 
 ```
-docker-compose build && docker-compose up
+docker-compose build && docker-compose run --service-ports rabbitmq
 ```
 
 The first time you do this, it will take some time, since it has to download everything it needs
 to build the Docker image.
 
 The RabbitMQ server will run in the foreground in the terminal where you started it. You can stop
-it by pressing CTRL+C. If you want to run it in the background, run `docker-compose up -d`.
+it by pressing CTRL+C. If you want to run it in the background, pass `-d` to `docker-compose`.
+
+### Toxiproxy
+
+If Toxiproxy is running locally on standard ports or started via Docker:
+
+```
+docker-compose run --service-ports toxiproxy
+```
+
+then Bunny will run additional resiliency tests.
 
 ### Running Test Suites
 
-Prior to running the tests, configure the RabbitMQ permissions by running `./bin/ci/before_build` 
-if you have RabbitMQ locally installed, if you are running RabbitMQ via Docker as above this step 
+Prior to running the tests, configure the RabbitMQ permissions by running `./bin/ci/before_build`
+if you have RabbitMQ locally installed, if you are running RabbitMQ via Docker as above this step
 is not required as the setup is baked in.
 
 Make sure you have those two installed and then run integration tests:

data/ChangeLog.md

@@ -1,7 +1,51 @@
-## Changes between Bunny 2.13.0 and 2.14.0 (unreleased)
+## Changes between Bunny 2.14.1 and 2.14.2 (unreleased)
 
 No changes yet.
 
+## Changes between Bunny 2.14.0 and 2.14.1 (Feb 26th, 2019)
+
+### Gem Installation Fixed on Windows
+
+`bin/ci`, a directory with symlinks, is no longer included into the gem.
+
+Contributed by Jack Xiaosong Xu.
+
+GitHub issue: [#573](https://github.com/ruby-amqp/bunny/pull/574)
+
+## Changes between Bunny 2.13.0 and 2.14.0 (Feb 20th, 2019)
+
+### Improved Peer Verification Failure Logging
+
+When [peer verification](https://www.rabbitmq.com/ssl.html#peer-verification) fails, the connection will now log
+some relevant peer certificate chain details. If Bunny
+log level is set to `debug`, the same information will be logged
+unconditionally.
+
+### Closing Connections without Waiting for Response
+
+`Bunny::Session#close` now accepts a parameter that controls whether
+it waits for a `connection.close-ok` frame. Not waiting is useful
+when it is known for a fact that the node might not respond
+(it might be shutting down, connection is known to be interrupted
+or unrecoverable and so on) or waiting is irrelevant to the caller.
+
+### Successful Connection Recovery Notification
+
+`Bunny::Session#after_recovery_completed` (accepts a block)
+and a new connection option, `:recovery_completed` (a callable object)
+can be used to react to successful connection and topology recovery.
+
+GitHub issue: [#573](https://github.com/ruby-amqp/bunny/pull/573).
+
+Contributed by Ionut Popa.
+
+### effin_utf8 Dependency Dropped
+
+This library no longer supports Ruby 1.8 and thus
+doesn't need to depend on the `effin_utf8` gem.
+
+Contributed by Luciano Sousa.
+
 
 ## Changes between Bunny 2.12.0 and 2.13.0 (Dec 25th, 2018)
 
@@ -19,13 +63,6 @@ connection could produce confusing log messages.
 
 GitHub issue: [#569](https://github.com/ruby-amqp/bunny/issues/569)
 
-### effin_utf8 Dependency Dropped
-
-This library no longer supports Ruby 1.8 and thus
-doesn't need to depend on the `effin_utf8` gem.
-
-Contributed by Luciano Sousa.
-
 
 ## Changes between Bunny 2.11.0 and 2.12.0 (Sep 22nd, 2018)
 
@@ -127,7 +164,7 @@ a zero read timeout.
 
 GitHub issue: [#551](https://github.com/ruby-amqp/bunny/pull/551).
 
-Contributed by Carl Hörberg.
+Contributed by Carl Hörberg.
 
 
 ### `verify_peer: false` Has the Expected Effect Again

data/Gemfile

@@ -20,7 +20,6 @@ extend Module.new {
 }
 
 gem "rake", ">= 12.3.1"
-gem "effin_utf8"
 
 group :development do
   gem "yard"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2018 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009–2019 Chris Duncan, Jakub Stastny aka botanicus,
 Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -71,6 +71,7 @@ a stable public API.
 Change logs per release series:
 
  * [master](https://github.com/ruby-amqp/bunny/blob/master/ChangeLog.md)
+ * [2.13.x](https://github.com/ruby-amqp/bunny/blob/2.13.x-stable/ChangeLog.md)
  * [2.12.x](https://github.com/ruby-amqp/bunny/blob/2.12.x-stable/ChangeLog.md)
  * [2.11.x](https://github.com/ruby-amqp/bunny/blob/2.11.x-stable/ChangeLog.md)
  * [2.10.x](https://github.com/ruby-amqp/bunny/blob/2.10.x-stable/ChangeLog.md)
@@ -96,7 +97,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.12.0"
+gem "bunny", ">= 2.13.0"
 ```
 
 

data/Rakefile

@@ -44,3 +44,11 @@ RSpec::Core::RakeTask.new(:stress) do |t|
 end
 
 task :default => :integration
+
+namespace :tls do
+  desc "Checks the certificates and keys in BUNNY_CERTIFICATE_DIR with openssl s_client"
+  task :s_client do
+    dir = ENV["BUNNY_CERTIFICATE_DIR"]
+    sh "openssl s_client -tls1_2 -connect 127.0.0.1:5671 -cert #{dir}/client_certificate.pem -key #{dir}/client_key.pem -CAfile #{dir}/ca_certificate.pem"
+  end
+end

data/bunny.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name = "bunny"
   s.version = Bunny::VERSION.dup
   s.homepage = "http://rubybunny.info"
-  s.summary = "Popular easy to use Ruby client for RabbitMQ"
-  s.description = "Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later versions."
+  s.summary = "Easy to use Ruby client for RabbitMQ"
+  s.description = "Easy to use, feature complete Ruby client for RabbitMQ"
   s.license = "MIT"
   s.required_ruby_version = Gem::Requirement.new(">= 2.2")
 
@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
     "Michael S. Klishin",
     "Stefan Kaes"]
 
-  s.email = ["michael.s.klishin@gmail.com"]
+  s.email = ["mklishin@pivotal.io"]
 
   # Dependencies
   s.add_runtime_dependency 'amq-protocol', '~> 2.3', '>= 2.3.0'
 
   # Files.
   s.extra_rdoc_files = ["README.md"]
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^bin/ci/}) }
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 end

data/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.7'
 services:
   rabbitmq:
     build: ./docker
@@ -8,7 +8,7 @@ services:
       # see CONTRIBUTING.md
       BUNNY_RABBITMQ_HOSTNAME: mercurio
       # link to spec specific configuration
-      RABBITMQ_CONFIG_FILE: /spec/config/rabbitmq
+      RABBITMQ_CONFIG_FILE: /spec/config/rabbitmq.conf
       RABBITMQ_ENABLED_PLUGINS_FILE: /spec/config/enabled_plugins
       # send logs to stdout
       RABBITMQ_LOGS: '-'
@@ -25,4 +25,4 @@ services:
       - 8474:8474
       - 11111:11111
     depends_on:
-      - rabbitmq
+      - rabbitmq

data/docker/Dockerfile

@@ -1,13 +1,17 @@
-FROM ubuntu:bionic
+FROM ubuntu:18.04
 
-RUN apt-get -q update && \
-    apt-get install -yq --no-install-recommends gnupg1 wget ca-certificates apt-transport-https
+RUN apt-get update -y
+RUN apt-get install -y gnupg2 wget
+RUN wget -O - "https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc" | apt-key add -
 
-RUN echo 'deb https://dl.bintray.com/rabbitmq/debian bionic main erlang' > /etc/apt/sources.list.d/rabbitmq.list && \
-    wget -O - 'https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc' | apt-key add -
+COPY apt/sources.list.d/bintray.rabbitmq.list /etc/apt/sources.list.d/bintray.rabbitmq.list
+COPY apt/preferences.d/erlang                 /etc/apt/preferences.d/erlang
 
-RUN apt-get -q update && \
-    apt-get install -yq rabbitmq-server
+RUN apt-get update -y
+
+RUN apt-get upgrade -y && \
+    apt-get install -y erlang-asn1 erlang-crypto erlang-public-key erlang-ssl && \
+    apt-get install -y rabbitmq-server
 
 COPY docker-entrypoint.sh /
 

data/docker/apt/preferences.d/erlang

@@ -0,0 +1,3 @@
+Package: erlang*
+Pin: release o=Bintray
+Pin-Priority: 1000

data/docker/apt/sources.list.d/bintray.rabbitmq.list

@@ -0,0 +1,2 @@
+deb http://dl.bintray.com/rabbitmq-erlang/debian bionic erlang
+deb http://dl.bintray.com/rabbitmq/debian bionic main

data/docker/docker-entrypoint.sh

@@ -3,35 +3,24 @@ server=rabbitmq-server
 ctl=rabbitmqctl
 delay=5
 
-echo "[Configuration] $(eval cat $RABBITMQ_CONFIG_FILE.config)"
-
-echo '[Configuration] Starting RabbitMQ in detached mode.'
-
+echo 'Starting a RabbitMQ node'
 $server -detached
 
-echo "[Configuration] Waiting $delay seconds for RabbitMQ to start."
+echo "Waiting $delay seconds for RabbitMQ to start."
 
 sleep $delay
 
-echo '*** Creating users ***'
 $ctl add_user bunny_gem bunny_password
 $ctl add_user bunny_reader reader_password
 
-echo '*** Creating virtual hosts ***'
 $ctl add_vhost bunny_testbed
 
-echo '*** Setting virtual host permissions ***'
 $ctl set_permissions -p / guest '.*' '.*' '.*'
 $ctl set_permissions -p bunny_testbed bunny_gem '.*' '.*' '.*'
 $ctl set_permissions -p bunny_testbed guest '.*' '.*' '.*'
 $ctl set_permissions -p bunny_testbed bunny_reader '^---$' '^---$' '.*'
 
-$ctl stop
-
-echo "[Configuration] Waiting $delay seconds for RabbitMQ to stop."
-
-sleep $delay
-
-echo 'Starting RabbitMQ in foreground (CTRL-C to exit)'
+$ctl shutdown --timeout 10
 
+echo 'Starting a RabbitMQ node in foreground (use Ctrl-C to stop)'
 exec $server

data/docker/rabbitmq.conf

@@ -0,0 +1,29 @@
+listeners.tcp.1 = 0.0.0.0:5672
+
+listeners.ssl.default = 5671
+
+ssl_options.cacertfile = /spec/tls/ca_certificate.pem
+ssl_options.certfile   = /spec/tls/server_certificate.pem
+ssl_options.keyfile    = /spec/tls/server_key.pem
+ssl_options.verify               = verify_none
+ssl_options.fail_if_no_peer_cert = false
+
+ssl_options.honor_cipher_order   = true
+ssl_options.honor_ecc_order      = true
+ssl_options.client_renegotiation = false
+ssl_options.secure_renegotiate   = true
+
+ssl_options.ciphers.1  = ECDHE-ECDSA-AES256-GCM-SHA384
+ssl_options.ciphers.2  = ECDHE-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.3  = ECDH-ECDSA-AES256-GCM-SHA384
+ssl_options.ciphers.4  = ECDH-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.5  = DHE-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.6  = DHE-DSS-AES256-GCM-SHA384
+ssl_options.ciphers.7  = ECDHE-ECDSA-AES128-GCM-SHA256
+ssl_options.ciphers.8  = ECDHE-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.9  = ECDH-ECDSA-AES128-GCM-SHA256
+ssl_options.ciphers.10 = ECDH-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.11 = DHE-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.12 = DHE-DSS-AES128-GCM-SHA256
+
+loopback_users = none

data/lib/bunny/session.rb

@@ -114,7 +114,8 @@ module Bunny
     # @option connection_string_or_opts [Integer] :connection_timeout (30) Timeout in seconds for connecting to the server.
     # @option connection_string_or_opts [Integer] :read_timeout (30) TCP socket read timeout in seconds. If heartbeats are disabled this will be ignored.
     # @option connection_string_or_opts [Integer] :write_timeout (30) TCP socket write timeout in seconds.
-    # @option connection_string_or_opts [Proc] :hosts_shuffle_strategy A Proc that reorders a list of host strings, defaults to Array#shuffle
+    # @option connection_string_or_opts [Proc] :hosts_shuffle_strategy a callable that reorders a list of host strings, defaults to Array#shuffle
+    # @option connection_string_or_opts [Proc] :recovery_completed a callable that will be called when a network recovery is performed
     # @option connection_string_or_opts [Logger] :logger The logger.  If missing, one is created using :log_file and :log_level.
     # @option connection_string_or_opts [IO, String] :log_file The file or path to use when creating a logger.  Defaults to STDOUT.
     # @option connection_string_or_opts [IO, String] :logfile DEPRECATED: use :log_file instead.  The file or path to use when creating a logger.  Defaults to STDOUT.
@@ -210,11 +211,13 @@ module Bunny
       @address_index_mutex = @mutex_impl.new
 
       @channels            = Hash.new
+      @recovery_completed = opts[:recovery_completed]
 
       @origin_thread       = Thread.current
 
       self.reset_continuations
       self.initialize_transport
+
     end
 
     def validate_connection_options(options)
@@ -367,14 +370,16 @@ module Bunny
     alias channel create_channel
 
     # Closes the connection. This involves closing all of its channels.
-    def close
+    def close(await_response = true)
       @status_mutex.synchronize { @status = :closing }
 
       ignoring_io_errors do
         if @transport.open?
+          @logger.debug "Transport is still open..."
           close_all_channels
 
-          self.close_connection(true)
+          @logger.debug "Will close all channels...."
+          self.close_connection(await_response)
         end
 
         clean_up_on_shutdown
@@ -383,6 +388,8 @@ module Bunny
         @status = :closed
         @manually_closed = true
       end
+      @logger.debug "Connection is closed"
+      true
     end
     alias stop close
 
@@ -567,11 +574,13 @@ module Bunny
     end
 
     # @private
-    def close_connection(sync = true)
+    def close_connection(await_response = true)
       if @transport.open?
+        @logger.debug "Transport is still open"
         @transport.send_frame(AMQ::Protocol::Connection::Close.encode(200, "Goodbye", 0, 0))
 
-        if sync
+        if await_response
+          @logger.debug "Waiting for a connection.close-ok..."
           @last_connection_close_ok = wait_on_continuations
         end
       end
@@ -742,6 +751,7 @@ module Bunny
         end
 
         recover_channels
+        notify_of_recovery_completion
       end
     rescue HostListDepleted
       reset_address_index
@@ -755,8 +765,10 @@ module Bunny
           retry
         end
       else
-        @logger.error "Ran out of recovery attempts (limit set to #{@max_recovery_attempts})"
-        self.close
+        @logger.error "Ran out of recovery attempts (limit set to #{@max_recovery_attempts}), giving up"
+        @transport.close
+        self.close(false)
+        @manually_closed = false
       end
     end
 
@@ -789,12 +801,20 @@ module Bunny
       @channel_mutex.synchronize do
         @channels.each do |n, ch|
           ch.open
-
           ch.recover_from_network_failure
         end
       end
     end
 
+    def after_recovery_completed(&block)
+      @recovery_completed = block
+    end
+
+    # @private
+    def notify_of_recovery_completion
+      @recovery_completed.call if @recovery_completed
+    end
+
     # @private
     def instantiate_connection_level_exception(frame)
       case frame
@@ -1200,7 +1220,7 @@ module Bunny
       # If heartbeats are disabled, assume that TCP keepalives or a similar mechanism will be used
       # and disable socket read timeouts. See ruby-amqp/bunny#551.
       @transport.read_timeout = @heartbeat * 2.2
-      @logger.debug { "Will use socket read timeout of #{@transport.read_timeout}" }
+      @logger.debug { "Will use socket read timeout of #{@transport.read_timeout.to_i} seconds" }
 
       # if there are existing channels we've just recovered from
       # a network failure and need to fix the allocated set. See issue 205. MK.