ConsumerWorkPool: don't wait for consumer shutdown if the pool isn't …

…active

Fixes #438.

lib/bunny/channel.rb

@@ -952,7 +952,9 @@ def basic_cancel(consumer_tag)
         @last_basic_cancel_ok = wait_on_continuations
       end
 
-      @work_pool.shutdown(true) unless any_consumers?
+      # reduces thread usage for channels that don't have any
+      # consumers
+      @work_pool.shutdown(true) unless self.any_consumers?
 
       @last_basic_cancel_ok
     end

lib/bunny/consumer_work_pool.rb

@@ -57,6 +57,7 @@ def busy?
     end
 
     def shutdown(wait_for_workers = false)
+      was_running = running?
       @running = false
 
       @size.times do
@@ -65,7 +66,7 @@ def shutdown(wait_for_workers = false)
         end
       end
 
-      return unless wait_for_workers && @shutdown_timeout
+      return if !(wait_for_workers && @shutdown_timeout && was_running)
 
       @shutdown_mutex.synchronize do
         @shutdown_conditional.wait(@shutdown_mutex, @shutdown_timeout)

spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -97,8 +97,10 @@
       sleep 1.0
 
       ch = connection.create_channel
+      ch.confirm_select
       ch.default_exchange.publish("", :routing_key => queue_name)
-      sleep 0.7
+      ch.wait_for_confirms
+      sleep 0.5
 
       consumer.cancel
       sleep 1.0
@@ -126,8 +128,10 @@
       sleep 1.0
 
       ch = connection.create_channel
+      ch.confirm_select
       ch.default_exchange.publish("", :routing_key => queue_name)
-      sleep 0.7
+      ch.wait_for_confirms
+      sleep 0.5
 
       consumer.cancel
       sleep 1.0