bunny 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7580b7ff949410f73fe0dd0d4425d19dd0b8b911
-  data.tar.gz: a6121f81e944a8765cb20ad27c2f2c9aecc38009
+  metadata.gz: de36b24ae58dc0288bf7f25d55c84d4fca21488b
+  data.tar.gz: eab9a6c204683443887320e9f54a29cc46c9b795
 SHA512:
-  metadata.gz: a773f870cdaaec57396812d6120a10052e74468f939f9f587d807755330ac21940248e6166fd46c710969dff365e23eb927bac3cad95fc25e6c07fa66cf8e04a
-  data.tar.gz: 75a2d552c4748e98424f8ce156eb37465550329ffe078184ecdf7103132ce9c8fedf615c8b8048491af018f3ceea2ec4b5f8399107b2e28a427fc544f8175630
+  metadata.gz: 2d4f79815730c98bc8df51ac8c5b0f14c1040d29d4ccf8b9dae8ded2bee0b43275364fdba63fbee6c4ef7f108ae2a6f80b269aa67b07021cedb90b5addfc0f24
+  data.tar.gz: 3790273b80d26a6ef6c910c59dc8d38a15e2c7d8bba9f5840598e77215e923b0d2418972acbb79ed2cfb52a0c0191700738ced4dc2923047afca9c4b387e2510

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Changes between Bunny 0.9.7 and 0.9.8
+
+### 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.
+
+
 ## Changes between Bunny 0.9.6 and 0.9.7
 
 ### Reentrant Mutex Implementation

data/lib/bunny/channel.rb

@@ -522,13 +522,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
@@ -765,9 +765,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
@@ -802,13 +802,13 @@ 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::Timer.timeout(read_write_timeout, ClientTimeout) do
@@ -822,6 +822,10 @@ 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)
 
@@ -847,13 +851,13 @@ 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::Timer.timeout(read_write_timeout, ClientTimeout) do
@@ -867,6 +871,10 @@ 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)
 
@@ -927,13 +935,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!
@@ -956,10 +964,10 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Queue::Delete.encode(@id,
-                                                                 name,
-                                                                 opts[:if_unused],
-                                                                 opts[:if_empty],
-                                                                 false))
+          name,
+          opts[:if_unused],
+          opts[:if_empty],
+          false))
       Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_delete_ok = wait_on_continuations
       end
@@ -1011,11 +1019,11 @@ module Bunny
                       end
 
       @connection.send_frame(AMQ::Protocol::Queue::Bind.encode(@id,
-                                                               name,
-                                                               exchange_name,
-                                                               opts[:routing_key],
-                                                               false,
-                                                               opts[:arguments]))
+          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
@@ -1047,10 +1055,10 @@ module Bunny
                       end
 
       @connection.send_frame(AMQ::Protocol::Queue::Unbind.encode(@id,
-                                                                 name,
-                                                                 exchange_name,
-                                                                 opts[:routing_key],
-                                                                 opts[:arguments]))
+          name,
+          exchange_name,
+          opts[:routing_key],
+          opts[:arguments]))
       Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_unbind_ok = wait_on_continuations
       end
@@ -1082,14 +1090,14 @@ 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]))
+          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
@@ -1112,9 +1120,9 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Exchange::Delete.encode(@id,
-                                                                    name,
-                                                                    opts[:if_unused],
-                                                                    false))
+          name,
+          opts[:if_unused],
+          false))
       Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_delete_ok = wait_on_continuations
       end
@@ -1154,11 +1162,11 @@ module Bunny
                          end
 
       @connection.send_frame(AMQ::Protocol::Exchange::Bind.encode(@id,
-                                                                  destination_name,
-                                                                  source_name,
-                                                                  opts[:routing_key],
-                                                                  false,
-                                                                  opts[:arguments]))
+          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
@@ -1198,11 +1206,11 @@ module Bunny
                          end
 
       @connection.send_frame(AMQ::Protocol::Exchange::Unbind.encode(@id,
-                                                                    destination_name,
-                                                                    source_name,
-                                                                    opts[:routing_key],
-                                                                    false,
-                                                                    opts[:arguments]))
+          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
@@ -1786,6 +1794,19 @@ 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

data/lib/bunny/version.rb

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

data/spec/issues/issue141_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe "Registering 2nd exclusive consumer on queue" do
+  let(:connection) do
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c.start
+    c
+  end
+
+  after :each do
+    connection.close if connection.open?
+  end
+
+
+  it "raises a meaningful exception" do
+    xs  = []
+
+    ch1 = connection.create_channel
+    ch2 = connection.create_channel
+    q1  = ch1.queue("", :auto_delete => true)
+    q2  = ch2.queue(q1.name, :auto_delete => true, :passive => true)
+
+    c1  = q1.subscribe(:exclusive => true) do |_, _, payload|
+      xs << payload
+    end
+    sleep 0.1
+
+    lambda do
+      q2.subscribe(:exclusive => true) do |_, _, _|
+      end
+    end.should raise_error(Bunny::AccessRefused)
+
+    ch1.should be_open
+    ch2.should be_closed
+
+    q1.publish("abc")
+    sleep 0.1
+
+    # verify that the first consumer is fine
+    xs.should == ["abc"]
+
+    q1.delete
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -162,6 +162,7 @@ files:
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
 - spec/issues/issue100_spec.rb
+- spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -250,6 +251,7 @@ test_files:
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
 - spec/issues/issue100_spec.rb
+- spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json