bunny 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00d3ad97db0f16249b51ccf1471f6b9c19a6a57d
-  data.tar.gz: 7011427b335e9a4913c180310c1bd3eec7b8f34f
+  metadata.gz: d39fdfc39df5c5c84ef856344c2d7242a83b30b7
+  data.tar.gz: a55c5f91d3bd260d400e79f1e9b58e93c70c9e73
 SHA512:
-  metadata.gz: bc7a6e64cbee2ca138a14df95e7d84248262d1593dbd27832d9b03dbaef6b4d78df06bc5ce1777f313e3dae8f169672b1e8de8f93191e0b39b8e0e087a4898d9
-  data.tar.gz: fe51e2257d33a5954921cc55bb511ea8496ef2425030077894a098d4eb07efe899f58242be2f2db02e1da007d5d83add2dee03030d0bafd598c8ef61cb140255
+  metadata.gz: 0db597e0e7af75a78d584aca113d250f5fa065da89eef1f988d88fa75ca81c7b2ce211f05a28026024c45e3ce32f86c2f958392f831b87fb5fa076bfd58856bd
+  data.tar.gz: 03d130d21a488b3d17edb29e08340a0d4429c2324a1c984afa90e667248ff48145efcaac9bcaeaccaa10aabf04211dbdc6c46c6ee7ba92f07bc4fa34fab1ac35

data/ChangeLog.md

@@ -1,4 +1,16 @@
-## Changes between Bunny 2.5.0 and 2.6.0 (unreleased)
+## Changes between Bunny 2.6.0 and 2.6.1 (October 23rd, 2016)
+
+### Bunny::ConsumerWorkPool#shutdown Terminates Early When It's Safe to Do So
+
+`Bunny::ConsumerWorkPool#shutdown(true)` waited for consumer shutdown
+even if the pool wasn't active (there were no consumers on its
+channel).
+
+GitHub issue: [#438](https://github.com/ruby-amqp/bunny/issues/438).
+
+
+
+## Changes between Bunny 2.5.0 and 2.6.0 (October 15th, 2016)
 
 ### Graceful Shutdown of Consumers
 

data/lib/bunny/channel.rb

@@ -952,7 +952,9 @@ module Bunny
         @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

data/lib/bunny/consumer_work_pool.rb

@@ -57,6 +57,7 @@ module Bunny
     end
 
     def shutdown(wait_for_workers = false)
+      was_running = running?
       @running = false
 
       @size.times do
@@ -65,7 +66,7 @@ module Bunny
         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)

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -97,8 +97,10 @@ describe Bunny::Consumer, "#cancel" do
       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 @@ describe Bunny::Consumer, "#cancel" do
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol