bunny 2.11.0 → 2.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30bc96b65edcb9a0d976408669ca1af4654e5a8a
-  data.tar.gz: 144a71c34e3f0cc04024dd7d80eb400fd1834a36
+SHA256:
+  metadata.gz: 80a243c18a410ace3d56439bf7cbb60141112e388db773e7b3fe1bbe6594ba30
+  data.tar.gz: 548aa57383b638a79a2b4863255c8235304b498a850204977ed965118d9131c3
 SHA512:
-  metadata.gz: f85596d0dd8e731f6d6bf6719d3f1324690762c61f2829ad65125a4b55d833c000b574f90160e956fefbff930519e9d33fab30723cb9b0a00de85e3252a208ae
-  data.tar.gz: 60ee0016f188410417f8742c24850fa57260808759c2c95f71f4c9ea2ea2cf9e940ea170b4503f6bca800f7ccf0cae5eabe382ebf00dbd432ad6337e64febcad
+  metadata.gz: fc92d15fa248ed121180d78db848b4b8399104e4d72aea6cbadca4a14ece080cd893a6db75b8c29fc02c002510ad15a0949492ce19062d8bb4b78e90d84500f9
+  data.tar.gz: 7cc116eec7ae1119d8216853af7f266e202756b983b910ae56c129ab0b2dbd93bb55213c2e682e56c3e56c5aac98ba2e04e92b57873702c51e358f0975112929

data/CONTRIBUTING.md

@@ -90,7 +90,7 @@ 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 up
+docker-compose build && docker-compose up
 ```
 
 The first time you do this, it will take some time, since it has to download everything it needs

data/ChangeLog.md

@@ -1,4 +1,64 @@
-## Changes between Bunny 2.10.0 and 2.11.0 (unreleased)
+## Changes between Bunny 2.11.0 and 2.12.0 (unreleased)
+
+### More Defensive Treatment of `queue.declare-ok` Responses
+
+Responses for `queue.declare` are now checked against a memoized
+queue name (but only if the queue is not server-named). This helps
+avoids scenarios with overlapping/concurrent requests due to high
+network latency as demonstrated in [#558](https://github.com/ruby-amqp/bunny/issues/558).
+
+"Mismatched" responses will be ignored: Bunny channel API would throw
+an exception for such declarations and there would be no way to "return to"
+even if a matching response arrived and was matched with one of the pending
+requests in a reasonable period of time.
+
+As part of this work a new Toxiproxy-based test suite was introduced
+to Bunny.
+
+GitHub issue: [#558](https://github.com/ruby-amqp/bunny/issues/558)
+
+Reproduction steps contributed by Brian Morton and Scott Bonebraker.
+
+### I/O Exceptions from Heartbeat Sender are Now Silent
+
+Heartbeat sender's purpose is to notify the peer, not so much
+to detect local connectivity failures; those will be detected
+by the I/O loop and transport.
+
+For single threaded connection users that prefer to roll their own
+recovery strategies getting exceptions from the heartbeat sender
+was counterproductive and painful to deal with.
+
+As part of this work a new Toxiproxy-based test suite was introduced
+to Bunny.
+
+GitHub issue: [#559](https://github.com/ruby-amqp/bunny/issues/559)
+
+Contributed by Scott Bonebraker.
+
+### Connection Recovery Will Fail When Max Retry Attempt Limit is Exceeded
+
+GitHub issue: [#549](https://github.com/ruby-amqp/bunny/issues/549)
+
+Contributed by Arlandis Word.
+
+### Squashed Warnings
+
+Many warnings have been eliminated.
+
+GitHub issue: [#563](https://github.com/ruby-amqp/bunny/issues/563)
+
+Contributed by @dacto.
+
+
+### API Reference Corrections
+
+GitHub issue: [#557](https://github.com/ruby-amqp/bunny/pull/557)
+
+Contributed by Bruno Costa.
+
+
+## Changes between Bunny 2.10.0 and 2.11.0 (Jun 21st, 2018)
 
 ### More Reliable System-wide Trusted Certificate Directory Detection
 
@@ -17,6 +77,7 @@ Contributed by Ana María Martínez Gómez.
 `2.10.0` is a maintenance release that introduces a couple of
 **minor potentially breaking changes**.
 
+
 ### Disabling Heartbeats Also Disables TCP Socket Read Timeouts
 
 Disabling heartbeats will now disable TCP socket read timeouts.

data/Gemfile

@@ -11,7 +11,7 @@ extend Module.new {
 
     local_path = File.expand_path("../vendor/#{name}", __FILE__)
     if File.exist?(local_path)
-      super name, options.merge(:path => local_path).
+      super name, options.merge(path: local_path).
         delete_if { |key, _| [:git, :branch].include?(key) }
     else
       super name, *args
@@ -19,21 +19,24 @@ extend Module.new {
   end
 }
 
-gem "rake", ">= 10.0.4"
+gem "rake", ">= 12.3.1"
 gem "effin_utf8"
 
 group :development do
   gem "yard"
 
-  gem "redcarpet", :platform => :mri
-  gem "ruby-prof", :platform => :mri
+  gem "redcarpet", platform: :mri
+  gem "ruby-prof", platform: :mri
 
-  gem "json",      :platform => :ruby_18
+  gem "ripl"
+  gem "ripl-multi_line"
+  gem "ripl-irb"
 end
 
 group :test do
   gem "rspec", "~> 3.5.0"
   gem "rabbitmq_http_api_client", "~> 1.9.1", require: "rabbitmq/http/client"
+  gem "toxiproxy", "~> 1.0.3"
 end
 
 gemspec
@@ -44,7 +47,7 @@ def custom_gem(name, options = Hash.new)
   local_path = File.expand_path("../vendor/#{name}", __FILE__)
   if File.exist?(local_path)
     puts "Using #{name} from #{local_path}..."
-    gem name, options.merge(:path => local_path).delete_if { |key, _| [:git, :branch].include?(key) }
+    gem name, options.merge(path: local_path).delete_if { |key, _| [:git, :branch].include?(key) }
   else
     gem name, options
   end

data/README.md

@@ -71,8 +71,9 @@ a stable public API.
 Change logs per release series:
 
  * [master](https://github.com/ruby-amqp/bunny/blob/master/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)
  * [2.9.x](https://github.com/ruby-amqp/bunny/blob/2.9.x-stable/ChangeLog.md)
- * [2.8.x](https://github.com/ruby-amqp/bunny/blob/2.8.x-stable/ChangeLog.md)
 
 
 
@@ -95,7 +96,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.10.0"
+gem "bunny", ">= 2.11.0"
 ```
 
 

data/bunny.gemspec

@@ -24,10 +24,9 @@ Gem::Specification.new do |s|
   s.email = ["michael.s.klishin@gmail.com"]
 
   # Dependencies
-  s.add_dependency "amq-protocol", "~> 2.3.0"
+  s.add_runtime_dependency 'amq-protocol', '~> 2.3', '>= 2.3.0'
 
   # Files.
-  s.has_rdoc = true
   s.extra_rdoc_files = ["README.md"]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

data/docker-compose.yml

@@ -17,4 +17,12 @@ services:
       - 5671-5672:5671-5672
       - 15672:15672
     volumes:
-      - ./spec:/spec:ro
+      - ./spec:/spec:ro
+  toxiproxy:
+    container_name: toxiproxy
+    image: shopify/toxiproxy
+    ports:
+      - 8474:8474
+      - 11111:11111
+    depends_on:
+      - rabbitmq

data/docker/Dockerfile

@@ -1,16 +1,16 @@
-FROM debian:jessie
+FROM ubuntu:bionic
 
 RUN apt-get -q update && \
-    apt-get install -yq --no-install-recommends wget ca-certificates
+    apt-get install -yq --no-install-recommends gnupg1 wget ca-certificates apt-transport-https
 
-RUN echo 'deb http://www.rabbitmq.com/debian/ testing main' > /etc/apt/sources.list.d/rabbitmq.list && \
-    wget -O- https://www.rabbitmq.com/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 -
 
 RUN apt-get -q update && \
-    apt-get install -yq --no-install-recommends rabbitmq-server
+    apt-get install -yq rabbitmq-server
 
 COPY docker-entrypoint.sh /
 
 ENTRYPOINT /docker-entrypoint.sh
 
-EXPOSE 5671 5672 15672
+EXPOSE 5671 5672 15672

data/lib/bunny/channel.rb

@@ -265,15 +265,6 @@ module Bunny
       @status == :closed
     end
 
-    def to_s
-      oid = ("0x%x" % (self.object_id << 1))
-      "<#{self.class.name}:#{oid} number=#{@channel.id} @open=#{open?} connection=#{@connection.to_s}>"
-    end
-
-    def inspect
-      to_s
-    end
-
     #
     # @group Backwards compatibility with 0.8.0
     #
@@ -657,7 +648,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, count, global))
 
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_basic_qos_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -678,7 +669,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Basic::Recover.encode(@id, requeue))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_basic_recover_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -885,7 +876,7 @@ module Bunny
           arguments))
 
       begin
-        Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+        with_continuation_timeout do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -935,7 +926,7 @@ module Bunny
           consumer.arguments))
 
       begin
-        Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+        with_continuation_timeout do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -970,7 +961,7 @@ module Bunny
     def basic_cancel(consumer_tag)
       @connection.send_frame(AMQ::Protocol::Basic::Cancel.encode(@id, consumer_tag, false))
 
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_basic_cancel_ok = wait_on_continuations
       end
 
@@ -994,7 +985,8 @@ module Bunny
 
     # Declares a queue using queue.declare AMQP 0.9.1 method.
     #
-    # @param [String] name Queue name
+    # @param [String] name The name of the queue or an empty string to let RabbitMQ generate a name.
+    #                      Note that LF and CR characters will be stripped from the value.
     # @param [Hash] opts Queue properties
     #
     # @option opts [Boolean] durable (false)     Should information about this queue be persisted to disk so that it
@@ -1012,16 +1004,28 @@ module Bunny
     def queue_declare(name, opts = {})
       raise_if_no_longer_open!
 
-      @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@id,
-          name,
+      # strip trailing new line and carriage returns
+      # just like RabbitMQ does
+      safe_name = name.gsub(/[\r\n]/, "")
+      @pending_queue_declare_name = safe_name
+      @connection.send_frame(
+        AMQ::Protocol::Queue::Declare.encode(@id,
+          @pending_queue_declare_name,
           opts.fetch(:passive, false),
           opts.fetch(:durable, false),
           opts.fetch(:exclusive, false),
           opts.fetch(:auto_delete, false),
           false,
           opts[:arguments]))
-      @last_queue_declare_ok = wait_on_continuations
 
+      begin
+        with_continuation_timeout do
+          @last_queue_declare_ok = wait_on_continuations
+        end
+      ensure
+        # clear pending continuation context if it belongs to us
+        @pending_queue_declare_name = nil if @pending_queue_declare_name == safe_name
+      end
       raise_if_continuation_resulted_in_a_channel_error!
 
       @last_queue_declare_ok
@@ -1046,7 +1050,7 @@ module Bunny
           opts[:if_unused],
           opts[:if_empty],
           false))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_queue_delete_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1066,7 +1070,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Queue::Purge.encode(@id, name, false))
 
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_queue_purge_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1102,7 +1106,7 @@ module Bunny
           (opts[:routing_key] || opts[:key]),
           false,
           opts[:arguments]))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_queue_bind_ok = wait_on_continuations
       end
 
@@ -1137,7 +1141,7 @@ module Bunny
           exchange_name,
           opts[:routing_key],
           opts[:arguments]))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_queue_unbind_ok = wait_on_continuations
       end
 
@@ -1150,26 +1154,30 @@ module Bunny
 
     # @group Exchange operations (exchange.*)
 
-    # Declares a echange using echange.declare AMQP 0.9.1 method.
+    # Declares a exchange using echange.declare AMQP 0.9.1 method.
     #
-    # @param [String] name Exchange name
+    # @param [String] name The name of the exchange. Note that LF and CR characters
+    #                       will be stripped from the value.
     # @param [String,Symbol] type Exchange type, e.g. :fanout or :topic
     # @param [Hash] opts Exchange properties
     #
-    # @option opts [Boolean] durable (false)     Should information about this echange be persisted to disk so that it
+    # @option opts [Boolean] durable (false)     Should information about this exchange be persisted to disk so that it
     #                                            can survive broker restarts? Typically set to true for long-lived exchanges.
-    # @option opts [Boolean] auto_delete (false) Should this echange be deleted when it is no longer used?
+    # @option opts [Boolean] auto_delete (false) Should this exchange be deleted when it is no longer used?
     # @option opts [Boolean] passive (false)   If true, exchange will be checked for existence. If it does not
     #                                          exist, {Bunny::NotFound} will be raised.
     #
     # @return [AMQ::Protocol::Exchange::DeclareOk] RabbitMQ response
-    # @see http://rubybunny.info/articles/echanges.html Exchanges and Publishing guide
+    # @see http://rubybunny.info/articles/exchanges.html Exchanges and Publishing guide
     # @api public
     def exchange_declare(name, type, opts = {})
       raise_if_no_longer_open!
 
+      # strip trailing new line and carriage returns
+      # just like RabbitMQ does
+      safe_name = name.gsub(/[\r\n]/, "")
       @connection.send_frame(AMQ::Protocol::Exchange::Declare.encode(@id,
-          name,
+          safe_name,
           type.to_s,
           opts.fetch(:passive, false),
           opts.fetch(:durable, false),
@@ -1177,7 +1185,7 @@ module Bunny
           opts.fetch(:internal, false),
           false, # nowait
           opts[:arguments]))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_exchange_declare_ok = wait_on_continuations
       end
 
@@ -1202,7 +1210,7 @@ module Bunny
           name,
           opts[:if_unused],
           false))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_exchange_delete_ok = wait_on_continuations
       end
 
@@ -1246,7 +1254,7 @@ module Bunny
           opts[:routing_key],
           false,
           opts[:arguments]))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_exchange_bind_ok = wait_on_continuations
       end
 
@@ -1290,7 +1298,7 @@ module Bunny
           opts[:routing_key],
           false,
           opts[:arguments]))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_exchange_unbind_ok = wait_on_continuations
       end
 
@@ -1318,7 +1326,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Channel::Flow.encode(@id, active))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_channel_flow_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1339,7 +1347,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Select.encode(@id))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_tx_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1355,7 +1363,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Commit.encode(@id))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_tx_commit_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1370,7 +1378,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Rollback.encode(@id))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_tx_rollback_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1417,7 +1425,7 @@ module Bunny
       @confirms_callback = callback
 
       @connection.send_frame(AMQ::Protocol::Confirm::Select.encode(@id, false))
-      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
+      with_continuation_timeout do
         @last_confirm_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1589,7 +1597,11 @@ module Bunny
 
     # @return [String] Brief human-readable representation of the channel
     def to_s
-      "#<#{self.class.name}:#{object_id} @id=#{self.number} @connection=#{@connection.to_s}>"
+      "#<#{self.class.name}:#{object_id} @id=#{self.number} @connection=#{@connection.to_s}> @open=#{open?}"
+    end
+
+    def inspect
+      to_s
     end
 
 
@@ -1597,6 +1609,11 @@ module Bunny
     # Implementation
     #
 
+    # @private
+    def with_continuation_timeout(&block)
+      Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout, &block)
+    end
+
     # @private
     def register_consumer(consumer_tag, consumer)
       @consumer_mutex.synchronize do
@@ -1620,12 +1637,33 @@ module Bunny
       end
     end
 
+    # @private
+    def pending_server_named_queue_declaration?
+      @pending_queue_declare_name && @pending_queue_declare_name.empty?
+    end
+
+    # @private
+    def can_accept_queue_declare_ok?(method)
+      @pending_queue_declare_name == method.queue ||
+        pending_server_named_queue_declaration?
+    end
+
     # @private
     def handle_method(method)
       @logger.debug { "Channel#handle_frame on channel #{@id}: #{method.inspect}" }
       case method
       when AMQ::Protocol::Queue::DeclareOk then
-        @continuations.push(method)
+        # safeguard against late arrivals of responses and
+        # so on, see ruby-amqp/bunny#558
+        if can_accept_queue_declare_ok?(method)
+          @continuations.push(method)
+        else
+          if !pending_server_named_queue_declaration?
+            # this response is for an outdated/overwritten
+            # queue.declare, drop it
+            @logger.warn "Received a queue.declare-ok response for a mismatching queue (#{method.queue} instead of #{@pending_queue_declare_name}) on channel #{@id} possibly due to a timeout, ignoring it"
+          end
+        end
       when AMQ::Protocol::Queue::DeleteOk then
         @continuations.push(method)
       when AMQ::Protocol::Queue::PurgeOk then

data/lib/bunny/consumer_work_pool.rb

@@ -25,6 +25,7 @@ module Bunny
       @shutdown_conditional = ::ConditionVariable.new
       @queue = ::Queue.new
       @paused = false
+      @running = false
     end
 
 

data/lib/bunny/cruby/ssl_socket.rb

@@ -24,6 +24,11 @@ module Bunny
                                       [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
                                     end
 
+      def initialize(*args)
+        super
+        @__bunny_socket_eof_flag__ = false
+      end
+
       # Reads given number of bytes with an optional timeout
       #
       # @param [Integer] count How many bytes to read

data/lib/bunny/heartbeat_sender.rb

@@ -29,6 +29,7 @@ module Bunny
         @interval = [(period / 2) - 1, 0.4].max
 
         @thread = Thread.new(&method(:run))
+        @thread.report_on_exception = false if @thread.respond_to?(:report_on_exception)
       end
     end
 
@@ -63,7 +64,7 @@ module Bunny
 
       if now > (@last_activity_time + @interval)
         @logger.debug { "Sending a heartbeat, last activity time: #{@last_activity_time}, interval (s): #{@interval}" }
-        @transport.write_without_timeout(AMQ::Protocol::HeartbeatFrame.encode)
+        @transport.write_without_timeout(AMQ::Protocol::HeartbeatFrame.encode, true)
       end
     end
   end

data/lib/bunny/jruby/ssl_socket.rb

@@ -8,6 +8,11 @@ module Bunny
       # methods found in Bunny::Socket.
       class SSLSocket < Bunny::SSLSocket
 
+        def initialize(*args)
+          super
+          @__bunny_socket_eof_flag__ = false
+        end
+
         # Reads given number of bytes with an optional timeout
         #
         # @param [Integer] count How many bytes to read

data/lib/bunny/queue.rb

@@ -375,11 +375,6 @@ module Bunny
 
     protected
 
-    # @private
-    def self.add_default_options(name, opts, block)
-      { :queue => name, :nowait => (block.nil? && !name.empty?) }.merge(opts)
-    end
-
     # @private
     def self.add_default_options(name, opts)
       # :nowait is always false for Bunny

data/lib/bunny/reader_loop.rb

@@ -16,6 +16,10 @@ module Bunny
       @logger         = @session.logger
 
       @mutex          = Mutex.new
+
+      @stopping        = false
+      @stopped         = false
+      @network_is_down = false
     end
 
 

data/lib/bunny/session.rb

@@ -78,7 +78,7 @@ module Bunny
 
     # @return [Bunny::Transport]
     attr_reader :transport
-    attr_reader :status, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :channel_max, :threaded
+    attr_reader :status, :heartbeat, :user, :pass, :vhost, :frame_max, :channel_max, :threaded
     attr_reader :server_capabilities, :server_properties, :server_authentication_mechanisms, :server_locales
     attr_reader :channel_id_allocator
     # Authentication mechanism, e.g. "PLAIN" or "EXTERNAL"
@@ -152,15 +152,17 @@ module Bunny
       @addresses       = self.addresses_from(opts)
       @address_index   = 0
 
-      # re-init, see above
-      @logger          = opts.fetch(:logger, init_default_logger(log_file, log_level))
-
+      @transport       = nil
       @user            = self.username_from(opts)
       @pass            = self.password_from(opts)
       @vhost           = self.vhost_from(opts)
       @threaded        = opts.fetch(:threaded, true)
 
+      # re-init, see above
+      @logger          = opts.fetch(:logger, init_default_logger(log_file, log_level))
+
       validate_connection_options(opts)
+      @last_connection_error = nil
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -188,6 +190,7 @@ module Bunny
       @client_channel_max = normalize_client_channel_max(opts.fetch(:channel_max, DEFAULT_CHANNEL_MAX))
       # will be-renegotiated during connection tuning steps. MK.
       @channel_max        = @client_channel_max
+      @heartbeat_sender   = nil
       @client_heartbeat   = self.heartbeat_from(opts)
 
       client_props         = opts[:properties] || opts[:client_properties] || {}
@@ -308,10 +311,6 @@ module Bunny
           @transport.post_initialize_socket
           @transport.connect
 
-          if @socket_configurator
-            @transport.configure_socket(&@socket_configurator)
-          end
-
           self.init_connection
           self.open_connection
 
@@ -418,7 +417,7 @@ module Bunny
       @status_mutex.synchronize { @status == :closed }
     end
 
-    # @return [Boolean] true if this AMQP 0.9.1 connection has been programmatically closed
+    # @return [Boolean] true if this AMQP 0.9.1 connection has been closed by the user (as opposed to the server)
     def manually_closed?
       @status_mutex.synchronize { @manually_closed == true }
     end
@@ -757,6 +756,7 @@ module Bunny
         end
       else
         @logger.error "Ran out of recovery attempts (limit set to #{@max_recovery_attempts})"
+        self.close
       end
     end
 
@@ -1078,9 +1078,13 @@ module Bunny
       # still recommend not sharing channels between threads except for consumer-only cases in the docs. MK.
       channel.synchronize do
         # see rabbitmq/rabbitmq-server#156
-        data = frames.reduce("") { |acc, frame| acc << frame.encode }
-        @transport.write(data)
-        signal_activity!
+        if open?
+          data = frames.reduce("") { |acc, frame| acc << frame.encode }
+          @transport.write(data)
+          signal_activity!
+        else
+          raise ConnectionClosedError.new(frames)
+        end
       end
     end # send_frameset(frames)
 
@@ -1096,8 +1100,12 @@ module Bunny
       # If we synchronize on the channel, however, this is both thread safe and pretty fine-grained
       # locking. See a note about "single frame" methods in a comment in `send_frameset`. MK.
       channel.synchronize do
-        frames.each { |frame| self.send_frame_without_timeout(frame, false) }
-        signal_activity!
+        if open?
+          frames.each { |frame| self.send_frame_without_timeout(frame, false) }
+          signal_activity!
+        else
+          raise ConnectionClosedError.new(frames)
+        end
       end
     end # send_frameset_without_timeout(frames)
 

data/lib/bunny/transport.rb

@@ -28,7 +28,6 @@ module Bunny
     attr_reader :session, :host, :port, :socket, :connect_timeout, :read_timeout, :write_timeout, :disconnect_timeout
     attr_reader :tls_context, :verify_peer, :tls_ca_certificates, :tls_certificate_path, :tls_key_path
 
-    attr_writer :read_timeout
     def read_timeout=(v)
       @read_timeout = v
       @read_timeout = nil if @read_timeout == 0
@@ -58,6 +57,8 @@ module Bunny
 
       @writes_mutex       = @session.mutex_impl.new
 
+      @socket = nil
+
       prepare_tls_context(opts) if @tls_enabled
     end
 
@@ -157,12 +158,13 @@ module Bunny
     end
 
     # Writes data to the socket without timeout checks
-    def write_without_timeout(data)
+    def write_without_timeout(data, raise_exceptions = false)
       begin
         @writes_mutex.synchronize { @socket.write(data) }
         @socket.flush
       rescue SystemCallError, Bunny::ConnectionError, IOError => e
         close
+        raise e if raise_exceptions
 
         if @session.automatically_recover?
           @session.handle_network_failure(e)

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.11.0"
+  VERSION = "2.12.0.rc1"
 end

data/repl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-bundle exec irb -Ilib -r'bunny'
+bundle exec ripl -Ilib -r'bunny' -r'ripl/multi_line' -r'ripl/irb'

data/spec/higher_level_api/integration/toxiproxy_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+require_relative "../../toxiproxy_helper"
+
+if ::Toxiproxy.running?
+  describe Bunny::Channel, "#basic_publish" do
+    include RabbitMQ::Toxiproxy
+
+
+    after :each do
+      @connection.close if @connection.open?
+    end
+
+    context "when the the connection detects missed heartbeats with automatic recovery" do
+      before(:each) do
+        setup_toxiproxy
+        @connection = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+          host: "localhost:11111", heartbeat_timeout: 1, automatically_recover: true)
+        @connection.start
+      end
+
+      let(:queue_name) { "bunny.basic.publish.queue#{rand}" }
+
+      it "raises a ConnectionClosedError" do
+        ch = @connection.create_channel
+        begin
+          rabbitmq_toxiproxy.down do
+            sleep 2
+            expect { ch.default_exchange.publish("", :routing_key => queue_name) }.to raise_error(Bunny::ConnectionClosedError)
+          end
+        ensure
+          cleanup_toxiproxy
+        end
+      end
+    end
+
+    context "when the the connection detects missed heartbeats without automatic recovery" do
+      before(:each) do
+        setup_toxiproxy
+        @connection = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+          host: "localhost:11111", heartbeat_timeout: 1, automatically_recover: false, threaded: false)
+        @connection.start
+      end
+
+      it "does not raise an exception on session thread" do
+       rabbitmq_toxiproxy.down do
+          sleep 5
+        end
+      end
+    end
+
+    context "recovery attempt limit that's exceeded" do
+      before(:each) do
+        setup_toxiproxy
+        @connection = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+          host: "localhost:11111", heartbeat_timeout: 1, automatically_recover: true, network_recovery_interval: 1,
+          recovery_attempts: 3, reset_recovery_attempts_after_reconnection: true)
+        @connection.start
+      end
+
+      it "permanently closes connection" do
+        expect(@connection.open?).to be(true)
+
+        rabbitmq_toxiproxy.down do
+          sleep 6
+        end
+        # give the connection oen last chance to recover
+        sleep 3
+
+        expect(@connection.closed?).to be(true)
+      end
+    end # context
+  end # describe
+else
+  puts "Toxiproxy isn't running, some examples will be skipped"
+end

data/spec/issues/issue549_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Bunny::Session do
+  context 'when retry attempts have been exhausted' do
+    let(:io) { StringIO.new } # keep test output clear
+
+    def create_session
+      described_class.new(
+        host: 'fake.host',
+        recovery_attempts: 0,
+        connection_timeout: 0,
+        network_recovery_interval: 0,
+        logfile: io,
+      )
+    end
+
+    it 'closes the session' do
+      session = create_session
+      session.handle_network_failure(StandardError.new)
+      expect(session.closed?).to be true
+    end
+
+    it 'stops the reader loop' do
+      session = create_session
+      reader_loop = session.reader_loop
+      session.handle_network_failure(StandardError.new)
+      expect(reader_loop.stopping?).to be true
+    end
+  end
+end

data/spec/toxiproxy_helper.rb

@@ -0,0 +1,28 @@
+module RabbitMQ
+  module Toxiproxy
+    RABBITMQ_UPSTREAM_HOST = if !ENV["LOCAL_RABBITMQ"].nil?
+                               # a local Toxiproxy/RabbitMQ combination
+                               "localhost"
+                             else
+                               # docker-compose
+                               "rabbitmq"
+                             end
+
+    def setup_toxiproxy
+      ::Toxiproxy.populate([{
+        name: "rabbitmq",
+        listen: "0.0.0.0:11111",
+            upstream: "#{RABBITMQ_UPSTREAM_HOST}:5672"
+      }])
+      rabbitmq_toxiproxy.enable
+    end
+
+    def cleanup_toxiproxy
+      ::Toxiproxy.populate()
+    end
+
+    def rabbitmq_toxiproxy
+      ::Toxiproxy[/rabbitmq/]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0.rc1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,13 +12,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
@@ -26,6 +29,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
@@ -174,6 +180,7 @@ files:
 - spec/higher_level_api/integration/read_only_consumer_spec.rb
 - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
 - spec/higher_level_api/integration/tls_connection_spec.rb
+- spec/higher_level_api/integration/toxiproxy_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
 - spec/higher_level_api/integration/with_channel_spec.rb
@@ -182,6 +189,7 @@ files:
 - spec/issues/issue202_spec.rb
 - spec/issues/issue224_spec.rb
 - spec/issues/issue465_spec.rb
+- spec/issues/issue549_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -205,6 +213,7 @@ files:
 - spec/tls/server.csr
 - spec/tls/server_certificate.pem
 - spec/tls/server_key.pem
+- spec/toxiproxy_helper.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/atomic_fixnum_spec.rb
 - spec/unit/concurrent/condition_spec.rb
@@ -227,12 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
@@ -275,6 +284,7 @@ test_files:
 - spec/higher_level_api/integration/read_only_consumer_spec.rb
 - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
 - spec/higher_level_api/integration/tls_connection_spec.rb
+- spec/higher_level_api/integration/toxiproxy_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
 - spec/higher_level_api/integration/with_channel_spec.rb
@@ -283,6 +293,7 @@ test_files:
 - spec/issues/issue202_spec.rb
 - spec/issues/issue224_spec.rb
 - spec/issues/issue465_spec.rb
+- spec/issues/issue549_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -306,6 +317,7 @@ test_files:
 - spec/tls/server.csr
 - spec/tls/server_certificate.pem
 - spec/tls/server_key.pem
+- spec/toxiproxy_helper.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/atomic_fixnum_spec.rb
 - spec/unit/concurrent/condition_spec.rb