hot_bunnies 1.4.0.pre2-java → 1.4.0.pre3-java

data/lib/hot_bunnies/queue.rb

@@ -59,6 +59,9 @@ module HotBunnies
     end
 
     class Subscription
+      import 'java.util.concurrent.TimeUnit'
+      import 'java.util.concurrent.atomic.AtomicBoolean'
+
       attr_reader :channel, :queue_name, :consumer_tag
 
       def initialize(channel, queue_name, options={})
@@ -66,17 +69,22 @@ module HotBunnies
         @queue_name = queue_name
         @ack        = options.fetch(:ack, false)
 
-        @cancelled  = java.util.concurrent.atomic.AtomicBoolean.new(false)
+        @cancelled  = AtomicBoolean.new(false)
       end
 
       def each(options={}, &block)
         raise 'The subscription already has a message listener' if @consumer
-        setup_consumer(options, block)
-        @consumer.start
+        start(create_consumer(options, block))
         nil
       end
       alias_method :each_message, :each
 
+      def start(consumer)
+        @consumer = consumer
+        @consumer_tag = @channel.basic_consume(@queue_name, !@ack, @consumer)
+        @consumer.start
+      end
+
       def cancel
         raise 'Can\'t cancel: the subscriber haven\'t received an OK yet' if !self.active?
         @consumer.cancel
@@ -110,12 +118,15 @@ module HotBunnies
       def maybe_shutdown_executor
         if @executor && @shut_down_executor
           @executor.shutdown
+          unless @executor.await_termination(1, TimeUnit::SECONDS)
+            @executor.shutdown_now
+          end
         end
       end
 
-      def setup_consumer(options, callback)
+      def create_consumer(options, callback)
         if options.fetch(:blocking, true)
-          @consumer = BlockingCallbackConsumer.new(@channel, options[:buffer_size], callback)
+          BlockingCallbackConsumer.new(@channel, options[:buffer_size], callback)
         else
           if options[:executor]
             @shut_down_executor = false
@@ -124,21 +135,14 @@ module HotBunnies
             @shut_down_executor = true
             @executor = java.util.concurrent.Executors.new_single_thread_executor
           end
-          @consumer = AsyncCallbackConsumer.new(@channel, callback, @executor)
+          AsyncCallbackConsumer.new(@channel, callback, @executor)
         end
-        @consumer_tag = @channel.basic_consume(@queue_name, !@ack, @consumer)
       end
     end
 
-    class CallbackConsumer < DefaultConsumer
-      def initialize(channel, callback)
-        super(channel)
-        @callback = callback
-        @callback_arity = @callback.arity
-        @cancelled = false
-        @cancelling = false
-      end
+    public
 
+    class BaseConsumer < DefaultConsumer
       def handleDelivery(consumer_tag, envelope, properties, body)
         body = String.from_java_bytes(body)
         headers = Headers.new(channel, consumer_tag, envelope, properties)
@@ -156,13 +160,25 @@ module HotBunnies
       def start
       end
 
+      def deliver(headers, message)
+        raise NotImplementedError, 'To be implemented by a subclass'
+      end
+
       def cancel
         channel.basic_cancel(consumer_tag)
         @cancelling = true
       end
+    end
 
-      def deliver(headers, message)
-        raise NotImplementedError, 'To be implemented by a subclass'
+    private
+
+    class CallbackConsumer < BaseConsumer
+      def initialize(channel, callback)
+        super(channel)
+        @callback = callback
+        @callback_arity = @callback.arity
+        @cancelled = false
+        @cancelling = false
       end
 
       def callback(headers, message)
@@ -194,6 +210,7 @@ module HotBunnies
       import 'java.util.concurrent.LinkedBlockingQueue'
       import 'java.util.concurrent.ArrayBlockingQueue'
       import 'java.util.concurrent.TimeUnit'
+      import 'java.lang.InterruptedException'
 
       def initialize(channel, buffer_size, callback)
         super(channel, callback)
@@ -206,8 +223,12 @@ module HotBunnies
 
       def start
         until @cancelled
-          pair = @internal_queue.poll(1, TimeUnit::SECONDS)
-          callback(*pair) if pair
+          begin
+            pair = @internal_queue.take
+            callback(*pair) if pair
+          rescue InterruptedException => e
+            # time to stop
+          end
         end
         while (pair = @internal_queue.poll)
           callback(*pair)
@@ -218,8 +239,10 @@ module HotBunnies
         if @cancelling || @cancelled
           @internal_queue.offer(pair)
         else
-          until @internal_queue.offer(pair, 1, TimeUnit::SECONDS)
-            break if @cancelling || @cancelled
+          begin
+            @internal_queue.put(pair)
+          rescue InterruptedException => e
+            # time to stop
           end
         end
       end

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = '1.4.0.pre2'
+  VERSION = '1.4.0.pre3'
 end

metadata

@@ -2,7 +2,7 @@
 name: hot_bunnies
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.4.0.pre2
+  version: 1.4.0.pre3
 platform: java
 authors: 
   - Theo Hultberg
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 Z
+date: 2012-06-29 00:00:00 Z
 dependencies: []
 
 description: A object oriented interface to RabbitMQ that uses the Java driver under the hood