bunny 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792b20042a60213fee5730fc4bf771dfe034d6bd
-  data.tar.gz: bd74266e1abd735322c449565e7d4041b3a51e09
+  metadata.gz: 549beacd9dcbe811dd5ad11c61efa51746eda01f
+  data.tar.gz: ed9a4c5d128c707122504fdfdae94556794d5633
 SHA512:
-  metadata.gz: 92377d74df1988a233dd3f7f296dd5b9b3b328f38138e7e8b64afc1a0a42e1883945e0f64859ad7309bbf1b30a764ac8025be38cf90b0af93b73306f04baceea
-  data.tar.gz: ca8e3dd099586e3f784b7db55c6a2f8de8c68b279bb0d75ea5f6456e37161c05bab2e613c4120966c5ee98d468e1a07ab387e6fdc281d4e1435478a931c4cf9f
+  metadata.gz: c3c90fb4df6a1ae0edff196e9b4cea4f2c7fc424b184dc6bc3b4215af3f01149442c57fd3eea2d857b733c05ebb2eb0d7530bb704fb55a50d832422a16a616bd
+  data.tar.gz: 87b6dc534478f963b80a82b06a4ccfbfb21bbbc01ee07c580e525bda26e0c86969d6b64890bac8afcd1b456f632b8edd537f61eca2fdf6dbf644453f99e5cdba

data/ChangeLog.md

@@ -1,4 +1,18 @@
-## Changes between Bunny 1.1.0.rc1 and 1.1.0.rc2
+## Changes between Bunny 1.1.0 and 1.1.1
+
+### Uncaught Consumer Exceptions
+
+Uncaught consumer exceptions are now handled by uncaught exceptions
+handler that can be defined per channel:
+
+``` ruby
+ch.on_uncaught_exception do |e, consumer|
+  # ...
+end
+```
+
+
+## Changes between Bunny 1.1.0.rc1 and 1.1.0
 
 ### Synchronized Session#create_channel and Session#close_channel
 

data/lib/bunny/channel.rb

@@ -193,6 +193,9 @@ module Bunny
       @next_publish_seq_no = 0
 
       @recoveries_counter = Bunny::Concurrent::AtomicFixnum.new(0)
+      @uncaught_exception_handler = Proc.new do |e, consumer|
+        @logger.error "Uncaught exception from consumer #{consumer.to_s}: #{e.message}"
+      end
     end
 
     attr_reader :recoveries_counter
@@ -1406,6 +1409,13 @@ module Bunny
       @on_error = block
     end
 
+    # Defines a handler for uncaught exceptions in consumers
+    # (e.g. delivered message handlers).
+    #
+    # @api public
+    def on_uncaught_exception(&block)
+      @uncaught_exception_handler = block
+    end
 
     #
     # Recovery
@@ -1569,6 +1579,7 @@ module Bunny
               consumer.handle_cancellation(method)
             rescue Exception => e
               @logger.error "Got exception when notifying consumer #{method.consumer_tag} about cancellation!"
+              @uncaught_exception_handler.call(e, consumer) if @uncaught_exception_handler
             end
           end
         else
@@ -1627,7 +1638,11 @@ module Bunny
       consumer = @consumers[basic_deliver.consumer_tag]
       if consumer
         @work_pool.submit do
-          consumer.call(DeliveryInfo.new(basic_deliver, consumer, self), MessageProperties.new(properties), content)
+          begin
+            consumer.call(DeliveryInfo.new(basic_deliver, consumer, self), MessageProperties.new(properties), content)
+          rescue StandardError => e
+            @uncaught_exception_handler.call(e, consumer) if @uncaught_exception_handler
+          end
         end
       else
         @logger.warn "No consumer for tag #{basic_deliver.consumer_tag} on channel #{@id}!"

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -222,4 +222,123 @@ describe Bunny::Queue, "#subscribe" do
     end
   end
 
+
+  context "with uncaught exceptions in delivery handler" do
+    context "and defined exception handler" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "uses exception handler" do
+        caught = nil
+        t = Thread.new do
+          ch = connection.create_channel
+          q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+
+          ch.on_uncaught_exception do |e, consumer|
+            caught = e
+          end
+
+          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+            raise RuntimeError.new(queue_name)
+          end
+        end
+        t.abort_on_exception = true
+        sleep 0.5
+
+        ch     = connection.create_channel
+        x  = ch.default_exchange
+        x.publish("hello", :routing_key => queue_name)
+        sleep 0.5
+
+        caught.message.should == queue_name
+
+        ch.close
+      end
+    end
+
+
+    context "and default exception handler" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "uses exception handler" do
+        t = Thread.new do
+          ch = connection.create_channel
+          q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+
+          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+            raise RuntimeError.new(queue_name)
+          end
+        end
+        t.abort_on_exception = true
+        sleep 0.5
+
+        ch     = connection.create_channel
+        x  = ch.default_exchange
+        5.times { x.publish("hello", :routing_key => queue_name) }
+        sleep 1.5
+
+        ch.close
+      end
+    end
+
+
+    context "with a single consumer" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "provides delivery tag access" do
+        delivery_tags = SortedSet.new
+
+        cch = connection.create_channel
+        q = cch.queue(queue_name, :auto_delete => true, :durable => false)
+        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          delivery_tags << delivery_info.delivery_tag
+        end
+        sleep 0.5
+
+        ch = connection.create_channel
+        x  = ch.default_exchange
+        100.times do
+          x.publish("hello", :routing_key => queue_name)
+        end
+
+        sleep 1.0
+        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+
+        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+
+        ch.close
+      end
+    end
+
+
+    context "with multiple consumers on the same channel" do
+      let(:queue_name) { "bunny.basic_consume#{rand}" }
+
+      it "provides delivery tag access" do
+        delivery_tags = SortedSet.new
+
+        cch = connection.create_channel
+        q   = cch.queue(queue_name, :auto_delete => true, :durable => false)
+
+        7.times do
+          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+            delivery_tags << delivery_info.delivery_tag
+          end
+        end
+        sleep 1.0
+
+        ch = connection.create_channel
+        x  = ch.default_exchange
+        100.times do
+          x.publish("hello", :routing_key => queue_name)
+        end
+
+        sleep 1.5
+        delivery_tags.should == SortedSet.new(Range.new(1, 100).to_a)
+
+        ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+
+        ch.close
+      end
+    end
+  end
 end # describe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol