hot_bunnies 2.0.0.pre1-java → 2.0.0.pre2-java

data/lib/hot_bunnies/consumers.rb

@@ -21,6 +21,22 @@ module HotBunnies
 
     def handleCancel(consumer_tag)
       @cancelled.set(true)
+      @channel.unregister_consumer(consumer_tag)
+
+      if f = @opts[:on_cancellation]
+        case f.arity
+        when 0 then
+          f.call
+        when 1 then
+          f.call(self)
+        when 2 then
+          f.call(@channel, self)
+        when 3 then
+          f.call(@channel, self, consumer_tag)
+        else
+          f.call(@channel, self, consumer_tag)
+        end
+      end
     end
 
     def handleCancelOk(consumer_tag)
@@ -70,9 +86,10 @@ module HotBunnies
   end
 
   class AsyncCallbackConsumer < CallbackConsumer
-    def initialize(channel, callback, executor)
+    def initialize(channel, opts, callback, executor)
       super(channel, callback)
       @executor = executor
+      @opts     = opts
     end
 
     def deliver(headers, message)
@@ -90,7 +107,13 @@ module HotBunnies
     def cancel
       super
 
-      maybe_shut_down_executor
+      gracefully_shutdown
+    end
+
+    def handleCancel(consumer_tag)
+      super(consumer_tag)
+
+      gracefully_shutdown
     end
 
     def shutdown!
@@ -100,6 +123,7 @@ module HotBunnies
 
     def gracefully_shut_down
       unless @executor.await_termination(1, JavaConcurrent::TimeUnit::SECONDS)
+        puts "Shutting down the executor.."
         @executor.shutdown_now
       end
     end
@@ -110,13 +134,15 @@ module HotBunnies
   class BlockingCallbackConsumer < CallbackConsumer
     include JavaConcurrent
 
-    def initialize(channel, buffer_size, callback)
+    def initialize(channel, buffer_size, opts, callback)
       super(channel, callback)
       if buffer_size
         @internal_queue = ArrayBlockingQueue.new(buffer_size)
       else
         @internal_queue = LinkedBlockingQueue.new
       end
+
+      @opts = opts
     end
 
     def start

data/lib/hot_bunnies/queue.rb

@@ -49,9 +49,9 @@ module HotBunnies
 
     def subscribe(opts = {}, &block)
       consumer = if opts[:block] || opts[:blocking]
-                   BlockingCallbackConsumer.new(@channel, opts[:buffer_size], block)
+                   BlockingCallbackConsumer.new(@channel, opts[:buffer_size], opts, block)
                  else
-                   AsyncCallbackConsumer.new(@channel, block, opts.fetch(:executor, JavaConcurrent::Executors.new_single_thread_executor))
+                   AsyncCallbackConsumer.new(@channel, opts, block, opts.fetch(:executor, JavaConcurrent::Executors.new_single_thread_executor))
                  end
 
       @consumer_tag     = @channel.basic_consume(@name, !(opts[:ack] || opts[:manual_ack]), consumer)

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = '2.0.0.pre1'
+  VERSION = "2.0.0.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_bunnies
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
   prerelease: 6
 platform: java
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: