bunny 0.10.8 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f535e615daf310f4a1e45b748799a0be9c7eb22d
-  data.tar.gz: d12db49e5f7805b56b3d3a28dc0c42a5b64c49b7
+  metadata.gz: ae97d1a6c3f9bd4e72d67961007677f20b86636b
+  data.tar.gz: d7fd9c501d71379469e61f68e99d0d3292bc3b32
 SHA512:
-  metadata.gz: 22a391ead25e9969d804a58452e3141606099c51b151b9985e8e2a3b3f116fda829aae2a340564d300b7d5533588fbaf0773a4d4444c5bda628bf1fafcf94384
-  data.tar.gz: 035be3322b48d97b81a7655637fc63c51cae129fca10a32a159e2c35d21c3c174203d6ea4975c646318dee09a94a747b169379569b16d626cd69d2cd04e5ee7e
+  metadata.gz: c405d0617f646cffc2f5fb8ab9950277e1913ed131c6c7aeba95a8ac89742dfe5f56f24332753c7ed1de6ed7490affd33c619f0eaafa9dc6d76cc6c000c64233
+  data.tar.gz: 39cd8727b32ad97113fe5f5f07197da4c3b8fa884de2a86201c00603f2a5df7037a9778653ab19b20b4972e992f296e791fb15c13ffcfe25f42eaa3e517cd837

data/.travis.yml

@@ -1,6 +1,6 @@
 bundler_args: --without development
 before_script: "./bin/ci/before_build.sh"
-script: "bundle exec rspec -cfs spec"
+script: "bundle exec rspec -c spec"
 rvm:
   - "2.0"
   - "1.9.3"
@@ -15,6 +15,3 @@ branches:
   only:
     - master
     - 0.9.x-stable
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode

data/ChangeLog.md

@@ -1,155 +1,4 @@
-## Changes between Bunny 0.10.6 and 0.10.7
-
-### Add timeout Bunny::ConsumerWorkPool#join
-
-`Bunny::ConsumerWorkPool#join` now accepts an optional
-timeout argument.
-
-
-## Changes between Bunny 0.10.5 and 0.10.6
-
-### Respect RABBITMQ_URL value
-
-`RABBITMQ_URL` env variable will now have effect even if
-Bunny.new is invoked without arguments.
-
-Contributed by Robert Ross.
-
-
-## Changes between Bunny 0.10.4 and 0.10.5
-
-### Bunny::Session.parse_uri
-
-`Bunny::Session.parse_uri` is a new method that parses
-connection URIs into hashes that `Bunny::Session#initialize`
-accepts.
-
-``` ruby
-Bunny::Session.parse_uri("amqp://user:pwd@broker.eng.megacorp.local/myapp_qa")
-```
-
-
-## Changes between Bunny 0.10.3 and 0.10.4
-
-### Default Paths for TLS/SSL CA's on All OS'es
-
-Bunny now uses OpenSSL to detect default TLS/SSL CA's paths, extending
-this feature to OS'es other than Linux.
-
-Contributed by Jingwen Owen Ou.
-
-
-## Changes between Bunny 0.10.2 and 0.10.3
-
-### Default Paths for TLS/SSL CA's on Linux
-
-Bunny now will use the following TLS/SSL CA's paths on Linux by default:
-
- * `/etc/ssl/certs/ca-certificates.crt` on Ubuntu/Debian
- * `/etc/ssl/certs/ca-bundle.crt` on Amazon Linux
- * `/etc/ssl/ca-bundle.pem` on OpenSUSE
- * `/etc/pki/tls/certs/ca-bundle.crt` on Fedora/RHEL
-
-and will log a warning if no CA files are available via default paths
-or `:tls_ca_certificates`.
-
-Contributed by Carl Hörberg.
-
-
-## Changes between Bunny 0.10.1 and 0.10.2
-
-### Consumers Can Be Re-Registered From Bunny::Consumer#handle_cancellation
-
-It is now possible to re-register a consumer (and use any other synchronous methods)
-from `Bunny::Consumer#handle_cancellation`, which is now invoked in the channel's
-thread pool.
-
-
-### Bunny::Session#close Fixed for Single Threaded Connections
-
-`Bunny::Session#close` with single threaded connections no longer fails
-with a nil pointer exception.
-
-
-
-## Changes between Bunny 0.10.0 and 0.10.1
-
-### Fix Abnormally Slow Bunny::Connection#close on JRuby
-
-`Bunny::Connection#close` on JRuby sometimes could enter a waiting
-state [on a native NIO/kqueue method] that lasted up to over 10 seconds.
-
-This severely affected test suite run times.
-
-
-## Changes between Bunny 0.9.0 and 0.10.0
-
-This release has one minor **breaking API change**.
-
-### Safe[r] basic.ack, basic.nack and basic.reject implementation
-
-Previously if a channel was recovered (reopened) by automatic connection
-recovery before a message was acknowledged or rejected, it would cause
-any operation on the channel that uses delivery tags to fail and
-cause the channel to be closed.
-
-To avoid this issue, every channel keeps a counter of how many times
-it has been reopened and marks delivery tags with them. Using a stale
-tag to ack or reject a message will produce no method sent to RabbitMQ.
-Note that unacknowledged messages will be requeued by RabbitMQ when connection
-goes down anyway.
-
-This involves an API change: `Bunny::DeliveryMetadata#delivery_tag` is now
-and instance of a class that responds to `#tag` and `#to_i` and is accepted
-by `Bunny::Channel#ack` and related methods.
-
-Integers are still accepted by the same methods.
-
-
-### Exclusivity Violation for Consumers Now Raises a Reasonable Exception
-
-When a second consumer is registered for the same queue on different channels,
-a reasonable exception (`Bunny::AccessRefused`) will be raised.
-
-
-### Reentrant Mutex Implementation
-
-Bunny now allows mutex impl to be configurable, uses reentrant Monitor
-by default.
-
-Non-reentrant mutexes is a major PITA and may affect code that
-uses Bunny.
-
-Avg. publishing throughput with Monitor drops slightly from
-5.73 Khz to 5.49 Khz (about 4% decrease), which is reasonable
-for Bunny.
-
-Apps that need these 4% can configure what mutex implementation
-is used on per-connection basis.
-
-### Eliminated Race Condition in Bunny::Session#close
-
-`Bunny::Session#close` had a race condition that caused (non-deterministic)
-exceptions when connection transport was closed before connection
-reader loop was guaranteed to have stopped.
-
-### connection.close Raises Exceptions on Connection Thread
-
-Connection-level exceptions (including when a connection is closed via
-management UI or `rabbitmqctl`) will now be raised on the connection
-thread so they
-
- * can be handled by applications
- * do not start connection recovery, which may be uncalled for
-
-### Client TLS Certificates are Optional
-
-Bunny will no longer require client TLS certificates. Note that CA certificate
-list is still necessary.
-
-If RabbitMQ TLS configuration requires peer verification, client certificate
-and private key are mandatory.
-
+## Changes between Bunny 0.9.0 and 1.0.0.pre1
 
 ### Publishing Over Closed Connections
 

data/Gemfile

@@ -19,7 +19,7 @@ extend Module.new {
   end
 }
 
-gem "SystemTimer", "~> 1.2.3", :platform => :ruby_18
+gem "SystemTimer", "1.2", :platform => :ruby_18
 
 gem "rake", ">= 10.0.4"
 gem "effin_utf8"

data/README.md

@@ -79,7 +79,7 @@ backwards compatible as possible but within reason.
 
 ### With Rubygems
 
-To install Bunny with RubyGems:
+To install Bunny 0.9.x with RubyGems:
 
 ```
 gem install bunny
@@ -87,17 +87,17 @@ gem install bunny
 
 ### Bundler Dependency
 
-To use Bunny in a project managed with Bundler:
+To use Bunny 0.9.x in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.10.7"
+gem "bunny", ">= 0.9.3"
 ```
 
 
-## Quick Start
+## Quick Start for Bunny 0.9.x
 
 Below is a small snippet that demonstrates how to publish
-and synchronously consume ("pull API") messages with Bunny.
+and synchronously consume ("pull API") messages with Bunny 0.9.
 
 For a 15 minute tutorial using more practical examples, see [Getting Started with RabbitMQ and Ruby using Bunny](http://rubybunny.info/articles/getting_started.html).
 

data/bunny.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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 2.0 and later versions."
+  s.description = "Easy to use, feature complete Ruby client for RabbitMQ 2.0."
   s.license = "MIT"
 
   # Sorted alphabetically.

data/lib/bunny.rb

@@ -4,12 +4,10 @@ require "timeout"
 
 require "bunny/version"
 require "amq/protocol/client"
-require "amq/protocol/extensions"
 
 require "bunny/framing"
 require "bunny/exceptions"
 require "bunny/socket"
-require "bunny/timeout"
 
 begin
   require "openssl"
@@ -34,6 +32,20 @@ module Bunny
   # AMQP protocol version Bunny implements
   PROTOCOL_VERSION = AMQ::Protocol::PROTOCOL_VERSION
 
+  # unifies Ruby standard library's Timeout (which is not accurate on
+  # Ruby 1.8 and has other issues) and SystemTimer (the gem)
+  Timer = if RUBY_VERSION < "1.9"
+            begin
+              require "bunny/system_timer"
+              Bunny::SystemTimer
+            rescue LoadError
+              Timeout
+            end
+          else
+            Timeout
+          end
+
+
   #
   # API
   #

data/lib/bunny/channel.rb

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 require "thread"
-require "monitor"
 require "set"
 
-require "bunny/concurrent/atomic_fixnum"
 require "bunny/consumer_work_pool"
 
 require "bunny/exchange"
@@ -175,10 +173,10 @@ module Bunny
       @work_pool  = work_pool
 
       # synchronizes frameset delivery. MK.
-      @publishing_mutex = @connection.mutex_impl.new
-      @consumer_mutex   = @connection.mutex_impl.new
+      @publishing_mutex = Mutex.new
+      @consumer_mutex   = Mutex.new
 
-      @unconfirmed_set_mutex = @connection.mutex_impl.new
+      @unconfirmed_set_mutex = Mutex.new
 
       self.reset_continuations
 
@@ -190,12 +188,8 @@ module Bunny
       @threads_waiting_on_basic_get_continuations = Set.new
 
       @next_publish_seq_no = 0
-
-      @recoveries_counter = Bunny::Concurrent::AtomicFixnum.new(0)
     end
 
-    attr_reader :recoveries_counter
-
     # @private
     def read_write_timeout
       @connection.read_write_timeout
@@ -443,9 +437,7 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def reject(delivery_tag, requeue = false)
-      guarding_against_stale_delivery_tags(delivery_tag) do
-        basic_reject(delivery_tag.to_i, requeue)
-      end
+      basic_reject(delivery_tag, requeue)
     end
 
     # Acknowledges a message. Acknowledged messages are completely removed from the queue.
@@ -456,9 +448,7 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def ack(delivery_tag, multiple = false)
-      guarding_against_stale_delivery_tags(delivery_tag) do
-        basic_ack(delivery_tag.to_i, multiple)
-      end
+      basic_ack(delivery_tag, multiple)
     end
     alias acknowledge ack
 
@@ -473,9 +463,7 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def nack(delivery_tag, multiple = false, requeue = false)
-      guarding_against_stale_delivery_tags(delivery_tag) do
-        basic_nack(delivery_tag.to_i, multiple, requeue)
-      end
+      basic_nack(delivery_tag, multiple, requeue)
     end
 
     # @endgroup
@@ -533,13 +521,13 @@ module Bunny
       end
 
       m = AMQ::Protocol::Basic::Publish.encode(@id,
-        payload,
-        meta,
-        exchange_name,
-        routing_key,
-        meta[:mandatory],
-        false,
-        @connection.frame_max)
+                                               payload,
+                                               meta,
+                                               exchange_name,
+                                               routing_key,
+                                               meta[:mandatory],
+                                               false,
+                                               @connection.frame_max)
       @connection.send_frameset_without_timeout(m, self)
 
       self
@@ -602,7 +590,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, prefetch_count, global))
 
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_qos_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -621,7 +609,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Basic::Recover.encode(@id, requeue))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_recover_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -712,7 +700,6 @@ module Bunny
     #   ch.basic_ack(delivery_info.delivery_tag, true)
     #
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
-    # @see #basic_ack_known_delivery_tag
     # @api public
     def basic_ack(delivery_tag, multiple)
       raise_if_no_longer_open!
@@ -777,9 +764,9 @@ module Bunny
     def basic_nack(delivery_tag, multiple = false, requeue = false)
       raise_if_no_longer_open!
       @connection.send_frame(AMQ::Protocol::Basic::Nack.encode(@id,
-          delivery_tag,
-          multiple,
-          requeue))
+                                                               delivery_tag,
+                                                               multiple,
+                                                               requeue))
 
       nil
     end
@@ -814,16 +801,16 @@ module Bunny
       end
 
       @connection.send_frame(AMQ::Protocol::Basic::Consume.encode(@id,
-          queue_name,
-          consumer_tag,
-          false,
-          no_ack,
-          exclusive,
-          false,
-          arguments))
+                                                                  queue_name,
+                                                                  consumer_tag,
+                                                                  false,
+                                                                  no_ack,
+                                                                  exclusive,
+                                                                  false,
+                                                                  arguments))
 
       begin
-        Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+        Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -834,16 +821,11 @@ module Bunny
         raise e
       end
 
-      # in case there is another exclusive consumer and we get a channel.close
-      # response here. MK.
-      raise_if_channel_close!(@last_basic_consume_ok)
-
       # covers server-generated consumer tags
       add_consumer(queue_name, @last_basic_consume_ok.consumer_tag, no_ack, exclusive, arguments, &block)
 
       @last_basic_consume_ok
     end
-    alias consume basic_consume
 
     # Registers a consumer for queue as {Bunny::Consumer} instance.
     #
@@ -864,16 +846,16 @@ module Bunny
       end
 
       @connection.send_frame(AMQ::Protocol::Basic::Consume.encode(@id,
-          consumer.queue_name,
-          consumer.consumer_tag,
-          false,
-          consumer.no_ack,
-          consumer.exclusive,
-          false,
-          consumer.arguments))
+                                                                  consumer.queue_name,
+                                                                  consumer.consumer_tag,
+                                                                  false,
+                                                                  consumer.no_ack,
+                                                                  consumer.exclusive,
+                                                                  false,
+                                                                  consumer.arguments))
 
       begin
-        Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+        Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -884,10 +866,6 @@ module Bunny
         raise e
       end
 
-      # in case there is another exclusive consumer and we get a channel.close
-      # response here. MK.
-      raise_if_channel_close!(@last_basic_consume_ok)
-
       # covers server-generated consumer tags
       register_consumer(@last_basic_consume_ok.consumer_tag, consumer)
 
@@ -895,7 +873,6 @@ module Bunny
 
       @last_basic_consume_ok
     end
-    alias consume_with basic_consume_with
 
     # Removes a consumer. Messages for this consumer will no longer be delivered. If the queue
     # it was on is auto-deleted and this consumer was the last one, the queue will be deleted.
@@ -908,7 +885,7 @@ module Bunny
     def basic_cancel(consumer_tag)
       @connection.send_frame(AMQ::Protocol::Basic::Cancel.encode(@id, consumer_tag, false))
 
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_cancel_ok = wait_on_continuations
       end
 
@@ -949,13 +926,13 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@id,
-          name,
-          opts.fetch(:passive, false),
-          opts.fetch(:durable, false),
-          opts.fetch(:exclusive, false),
-          opts.fetch(:auto_delete, false),
-          false,
-          opts[:arguments]))
+                                                                  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
 
       raise_if_continuation_resulted_in_a_channel_error!
@@ -978,11 +955,11 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Queue::Delete.encode(@id,
-          name,
-          opts[:if_unused],
-          opts[:if_empty],
-          false))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                 name,
+                                                                 opts[:if_unused],
+                                                                 opts[:if_empty],
+                                                                 false))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_delete_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1002,7 +979,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Queue::Purge.encode(@id, name, false))
 
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_purge_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1033,12 +1010,12 @@ module Bunny
                       end
 
       @connection.send_frame(AMQ::Protocol::Queue::Bind.encode(@id,
-          name,
-          exchange_name,
-          opts[:routing_key],
-          false,
-          opts[:arguments]))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                               name,
+                                                               exchange_name,
+                                                               opts[:routing_key],
+                                                               false,
+                                                               opts[:arguments]))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_bind_ok = wait_on_continuations
       end
 
@@ -1069,11 +1046,11 @@ module Bunny
                       end
 
       @connection.send_frame(AMQ::Protocol::Queue::Unbind.encode(@id,
-          name,
-          exchange_name,
-          opts[:routing_key],
-          opts[:arguments]))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                 name,
+                                                                 exchange_name,
+                                                                 opts[:routing_key],
+                                                                 opts[:arguments]))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_unbind_ok = wait_on_continuations
       end
 
@@ -1104,15 +1081,15 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Exchange::Declare.encode(@id,
-          name,
-          type.to_s,
-          opts.fetch(:passive, false),
-          opts.fetch(:durable, false),
-          opts.fetch(:auto_delete, false),
-          false,
-          false,
-          opts[:arguments]))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                     name,
+                                                                     type.to_s,
+                                                                     opts.fetch(:passive, false),
+                                                                     opts.fetch(:durable, false),
+                                                                     opts.fetch(:auto_delete, false),
+                                                                     false,
+                                                                     false,
+                                                                     opts[:arguments]))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_declare_ok = wait_on_continuations
       end
 
@@ -1134,10 +1111,10 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Exchange::Delete.encode(@id,
-          name,
-          opts[:if_unused],
-          false))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                    name,
+                                                                    opts[:if_unused],
+                                                                    false))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_delete_ok = wait_on_continuations
       end
 
@@ -1176,12 +1153,12 @@ module Bunny
                          end
 
       @connection.send_frame(AMQ::Protocol::Exchange::Bind.encode(@id,
-          destination_name,
-          source_name,
-          opts[:routing_key],
-          false,
-          opts[:arguments]))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                  destination_name,
+                                                                  source_name,
+                                                                  opts[:routing_key],
+                                                                  false,
+                                                                  opts[:arguments]))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_bind_ok = wait_on_continuations
       end
 
@@ -1220,12 +1197,12 @@ module Bunny
                          end
 
       @connection.send_frame(AMQ::Protocol::Exchange::Unbind.encode(@id,
-          destination_name,
-          source_name,
-          opts[:routing_key],
-          false,
-          opts[:arguments]))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+                                                                    destination_name,
+                                                                    source_name,
+                                                                    opts[:routing_key],
+                                                                    false,
+                                                                    opts[:arguments]))
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_unbind_ok = wait_on_continuations
       end
 
@@ -1253,7 +1230,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Channel::Flow.encode(@id, active))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_channel_flow_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1274,7 +1251,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Select.encode(@id))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1289,7 +1266,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Commit.encode(@id))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_commit_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1304,7 +1281,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Rollback.encode(@id))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_rollback_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1344,7 +1321,7 @@ module Bunny
       @confirms_callback = callback
 
       @connection.send_frame(AMQ::Protocol::Confirm::Select.encode(@id, false))
-      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_confirm_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1421,7 +1398,6 @@ module Bunny
       # this includes recovering bindings
       recover_queues
       recover_consumers
-      increment_recoveries_counter
     end
 
     # Recovers basic.qos setting. Used by the Automatic Network Failure
@@ -1467,11 +1443,6 @@ module Bunny
       end
     end
 
-    # @private
-    def increment_recoveries_counter
-      @recoveries_counter.increment
-    end
-
     # @endgroup
 
 
@@ -1540,17 +1511,10 @@ module Bunny
         @continuations.push(method)
       when AMQ::Protocol::Basic::Cancel then
         if consumer = @consumers[method.consumer_tag]
-          @work_pool.submit do
-            begin
-              @consumers.delete(method.consumer_tag)
-              consumer.handle_cancellation(method)
-            rescue Exception => e
-              @logger.error "Got excepton when notifying consumer #{method.consumer_tag} about cancellation!"
-            end
-          end
-        else
-          @logger.warn "No consumer for tag #{method.consumer_tag} on channel #{@id}!"
+          consumer.handle_cancellation(method)
         end
+
+        @consumers.delete(method.consumer_tag)
       when AMQ::Protocol::Basic::CancelOk then
         @continuations.push(method)
         unregister_consumer(method.consumer_tag)
@@ -1590,7 +1554,6 @@ module Bunny
 
     # @private
     def handle_basic_get_ok(basic_get_ok, properties, content)
-      basic_get_ok.delivery_tag = VersionedDeliveryTag.new(basic_get_ok.delivery_tag, @recoveries_counter.get)
       @basic_get_continuations.push([basic_get_ok, properties, content])
     end
 
@@ -1642,8 +1605,10 @@ module Bunny
 
       @unconfirmed_set_mutex.synchronize do
         @only_acks_received = (@only_acks_received && !nack)
+        @logger.debug "Channel #{@id}: @only_acks_received = #{@only_acks_received.inspect}, nack: #{nack.inspect}"
 
         @confirms_continuations.push(true) if @unconfirmed_set.empty?
+
         @confirms_callback.call(delivery_tag, multiple, nack) if @confirms_callback
       end
     end
@@ -1820,19 +1785,6 @@ module Bunny
       raise ChannelAlreadyClosed.new("cannot use a channel that was already closed! Channel id: #{@id}", self) if closed?
     end
 
-    # @private
-    def raise_if_channel_close!(method)
-      if method && method.is_a?(AMQ::Protocol::Channel::Close)
-        # basic.ack, basic.reject, basic.nack. MK.
-        if channel_level_exception_after_operation_that_has_no_response?(method)
-          @on_error.call(self, method) if @on_error
-        else
-          @last_channel_error = instantiate_channel_level_exception(method)
-          raise @last_channel_error
-        end
-      end
-    end
-
     # @private
     def reset_continuations
       @continuations           = new_continuation
@@ -1852,21 +1804,5 @@ module Bunny
         Concurrent::ContinuationQueue.new
       end
     end # if defined?
-
-    # @private
-    def guarding_against_stale_delivery_tags(tag, &block)
-      case tag
-        # if a fixnum was passed, execute unconditionally. MK.
-      when Fixnum then
-        block.call
-        # versioned delivery tags should be checked to avoid
-        # sending out stale (invalid) tags after channel was reopened
-        # during network failure recovery. MK.
-      when VersionedDeliveryTag then
-        if !tag.stale?(@recoveries_counter.get)
-          block.call
-        end
-      end
-    end
   end # Channel
 end # Bunny