bunny 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e5ee2f2801f1420033324361e8fe9768a48e7e
-  data.tar.gz: b1f35041c2d32444ab5290301cbab613c4d63abd
+  metadata.gz: f5f79488e6b65537ea12c2a0675e23f22b954f04
+  data.tar.gz: ececfcb8dc3374af17d6a2e9265a6b4a1fa02d8a
 SHA512:
-  metadata.gz: 35622fd832fd559a594c7eb1bbb46576f1831d34c4bb2a1b9e4ee86e58500afa39e179785388aba9ca3a9311665f193b06d96b10429be7bc33dd6d54f98de706
-  data.tar.gz: 9f39c1e15d01f1a09f617a411f7d157028e2efe4cb4eb905564f73a08ff956e2fbbfdb0cb71cb9087aca7b0f3c0082fee348dc9ba41764876d857f2a14fdf7a2
+  metadata.gz: 39577f8e482fc0fdbd727077c82747a262f97967c3e8e8027a410a2bc08cf41cf45edd46f383c1128f308c40c4602ecfaf64d56323cba3d8528582706f3ee292
+  data.tar.gz: c22ca1d276aaa7d9dd992040366dcb3d27179dadc10c7204de1e2e75a8f641de955755a0118feb874507e9c3ee7a883a361787251fdea8834c59647cb7fc4719

data/ChangeLog.md

@@ -1,3 +1,26 @@
+## 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.
+
+
+### 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

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

data/lib/bunny/channel.rb

@@ -843,6 +843,7 @@ module Bunny
 
       @last_basic_consume_ok
     end
+    alias consume basic_consume
 
     # Registers a consumer for queue as {Bunny::Consumer} instance.
     #
@@ -894,6 +895,7 @@ 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.
@@ -1538,10 +1540,17 @@ module Bunny
         @continuations.push(method)
       when AMQ::Protocol::Basic::Cancel then
         if consumer = @consumers[method.consumer_tag]
-          consumer.handle_cancellation(method)
+          @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}!"
         end
-
-        @consumers.delete(method.consumer_tag)
       when AMQ::Protocol::Basic::CancelOk then
         @continuations.push(method)
         unregister_consumer(method.consumer_tag)
@@ -1847,12 +1856,12 @@ module Bunny
     # @private
     def guarding_against_stale_delivery_tags(tag, &block)
       case tag
-      # if a fixnum was passed, execute unconditionally. MK.
+        # 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.
+        # 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

data/lib/bunny/reader_loop.rb

@@ -91,16 +91,18 @@ module Bunny
     end
 
     def raise(e)
-      @thread.raise(e)
+      @thread.raise(e) if @thread
     end
 
     def join
-      @thread.join
+      @thread.join if @thread
     end
 
     def kill
-      @thread.kill
-      @thread.join
+      if @thread
+        @thread.kill
+        @thread.join
+      end
     end
 
     def log_exception(e)

data/lib/bunny/session.rb

@@ -226,7 +226,7 @@ module Bunny
         self.open_connection
 
         @reader_loop = nil
-        self.start_reader_loop if @threaded
+        self.start_reader_loop if threaded?
 
         @default_channel = self.create_channel
       rescue Exception => e
@@ -269,9 +269,7 @@ module Bunny
           self.close_connection(true)
         end
 
-        # puts "before maybe_shutdown_reader_loop"
         maybe_shutdown_reader_loop
-        # puts "after maybe_shutdown_reader_loop"
         close_transport
 
         @status = :closed
@@ -628,18 +626,22 @@ module Bunny
     def maybe_shutdown_reader_loop
       if @reader_loop
         @reader_loop.stop
-        # this is the easiest way to wait until the loop
-        # is guaranteed to have terminated
-        @reader_loop.raise(ShutdownSignal)
-        # joining the thread here may take forever
-        # on JRuby because sun.nio.ch.KQueueArrayWrapper#kevent0 is
-        # a native method that cannot be (easily) interrupted.
-        # So we use this ugly hack or else our test suite takes forever
-        # to run on JRuby (a new connection is opened/closed per example). MK.
-        if RUBY_ENGINE == "jruby"
-          sleep 0.075
+        if threaded?
+          # this is the easiest way to wait until the loop
+          # is guaranteed to have terminated
+          @reader_loop.raise(ShutdownSignal)
+          # joining the thread here may take forever
+          # on JRuby because sun.nio.ch.KQueueArrayWrapper#kevent0 is
+          # a native method that cannot be (easily) interrupted.
+          # So we use this ugly hack or else our test suite takes forever
+          # to run on JRuby (a new connection is opened/closed per example). MK.
+          if RUBY_ENGINE == "jruby"
+            sleep 0.075
+          else
+            @reader_loop.join
+          end
         else
-          @reader_loop.join
+          # single threaded mode, nothing to do. MK.
         end
       end
 

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/connection_stop_spec.rb

@@ -11,3 +11,16 @@ describe Bunny::Session do
     c.should be_closed
   end
 end
+
+
+describe Bunny::Session, "in a single threaded mode" do
+  it "can be closed" do
+    c  = Bunny.new(:automatically_recover => false, :threaded => false)
+    c.start
+    ch = c.create_channel
+
+    c.should be_connected
+    c.stop
+    c.should be_closed
+  end
+end

data/spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb

@@ -80,4 +80,49 @@ describe Bunny::Channel do
       ch.close
     end
   end
+
+
+
+  context "with consumer re-registration" do
+    class ExampleConsumerThatReregisters < Bunny::Consumer
+      def handle_cancellation(_)
+        @queue = @channel.queue("basic.consume.after_cancellation", :auto_delete => true)
+        @channel.basic_consume_with(self)
+      end
+    end
+
+    let(:queue_name) { "basic.consume#{rand}" }
+
+    it "works correctly" do
+      consumer = nil
+      xs       = []
+
+      ch = connection.create_channel
+      t  = Thread.new do
+        ch2 = connection.create_channel
+        q   = ch2.queue(queue_name, :auto_delete => true)
+
+        consumer = ExampleConsumerThatReregisters.new(ch2, q, "")
+        consumer.on_delivery do |_, _, payload|
+          xs << payload
+        end
+        q.subscribe_with(consumer)
+      end
+      t.abort_on_exception = true
+
+      sleep 0.5
+      x = ch.default_exchange
+      x.publish("abc", :routing_key => queue_name)
+
+      sleep 0.5
+      ch.queue(queue_name, :auto_delete => true).delete
+
+      x.publish("abc", :routing_key => queue_name)
+      sleep 0.5
+      q = ch.queue("basic.consume.after_cancellation", :auto_delete => true)
+      xs.should == ["abc"]
+
+      ch.close
+    end
+  end
 end

data/spec/stress/connection_open_close_spec.rb

@@ -22,5 +22,19 @@ unless RUBY_ENGINE == "jruby" && !ENV["FORCE_JRUBY_RUN"]
         c.should be_closed
       end
     end
+
+    context "in the single threaded mode" do
+      n.times do |i|
+        it "can be closed (take #{i})" do
+          c  = Bunny.new(:automatically_recover => false, :threaded => false)
+          c.start
+          ch = c.create_channel
+
+          c.should be_connected
+          c.stop
+          c.should be_closed
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -28,7 +28,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
-description: Easy to use, feature complete Ruby client for RabbitMQ 2.0.
+description: Easy to use, feature complete Ruby client for RabbitMQ 2.0 and later
+  versions.
 email:
 - celldee@gmail.com
 - eric@5stops.com