hot_bunnies 2.0.0.pre6-java → 2.0.0.pre7-java

data/lib/hot_bunnies/channel.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
+require "hot_bunnies/shutdown_listener"
 
 module HotBunnies
   class Channel
-    attr_reader :session
+    attr_reader :session, :consumers
 
     def initialize(session, delegate)
       @connection = session
@@ -12,12 +13,20 @@ module HotBunnies
       # executors when the channel is closed. This frees library users
       # from having to worry about this. MK.
       @consumers  = ConcurrentHashMap.new
+
+      on_shutdown do |ch, cause|
+        ch.gracefully_shut_down_consumers
+      end
     end
 
     def client
       @connection
     end
 
+    def connection
+      @connection
+    end
+
     def id
       @delegate.channel_number
     end
@@ -42,6 +51,12 @@ module HotBunnies
       v
     end
 
+    def on_shutdown(&block)
+      sh = ShutdownListener.new(self, &block)
+      @connection.add_shutdown_listener(sh)
+
+      sh
+    end
 
     # @group Exchanges
 
@@ -297,6 +312,13 @@ module HotBunnies
       @consumers.delete(consumer_tag)
     end
 
+    # @private
+    def gracefully_shut_down_consumers
+      @consumers.each do |tag, consumer|
+        consumer.gracefully_shut_down
+      end
+    end
+
     # Executes a block, catching Java exceptions RabbitMQ Java client throws and
     # transforms them to Ruby exceptions that are then re-raised.
     #

data/lib/hot_bunnies/consumers.rb

@@ -10,6 +10,8 @@ module HotBunnies
 
       @cancelling = JavaConcurrent::AtomicBoolean.new
       @cancelled  = JavaConcurrent::AtomicBoolean.new
+
+      @terminated = JavaConcurrent::AtomicBoolean.new
     end
 
     def handleDelivery(consumer_tag, envelope, properties, body)
@@ -37,11 +39,15 @@ module HotBunnies
           f.call(@channel, self, consumer_tag)
         end
       end
+
+      @terminated.set(true)
     end
 
     def handleCancelOk(consumer_tag)
       @cancelled.set(true)
       @channel.unregister_consumer(consumer_tag)
+
+      @terminated.set(true)
     end
 
     def start
@@ -55,6 +61,7 @@ module HotBunnies
       @cancelling.set(true)
       response = channel.basic_cancel(consumer_tag)
       @cancelled.set(true)
+      @terminated.set(true)
 
       response
     end
@@ -64,7 +71,11 @@ module HotBunnies
     end
 
     def active?
-      !cancelled?
+      !terminated?
+    end
+
+    def terminated?
+      @terminated.get
     end
   end
 
@@ -127,6 +138,7 @@ module HotBunnies
       unless @executor.await_termination(1, JavaConcurrent::TimeUnit::SECONDS)
         @executor.shutdown_now
       end
+      @terminated.set(true)
     end
     alias maybe_shut_down_executor gracefully_shut_down
     alias gracefully_shutdown      gracefully_shut_down
@@ -135,6 +147,8 @@ module HotBunnies
   class BlockingCallbackConsumer < CallbackConsumer
     include JavaConcurrent
 
+    POISON = :__poison__
+
     def initialize(channel, buffer_size, opts, callback)
       super(channel, callback)
       if buffer_size
@@ -151,7 +165,13 @@ module HotBunnies
       until (@cancelling.get || @cancelled.get) || JavaConcurrent::Thread.current_thread.interrupted?
         begin
           pair = @internal_queue.take
-          callback(*pair) if pair
+          if pair
+            if pair == POISON
+              @cancelling.set(true)
+            else
+              callback(*pair)
+            end
+          end
         rescue InterruptedException => e
           interrupted = true
         end
@@ -159,6 +179,7 @@ module HotBunnies
       while (pair = @internal_queue.poll)
         callback(*pair)
       end
+      @terminated.set(true)
       if interrupted
         JavaConcurrent::Thread.current_thread.interrupt
       end
@@ -175,5 +196,13 @@ module HotBunnies
         end
       end
     end
+
+    def gracefully_shut_down
+      @cancelling.set(true)
+      @internal_queue.offer(POISON)
+
+      @terminated.set(true)
+    end
+
   end
 end

data/lib/hot_bunnies/exceptions.rb

@@ -2,6 +2,14 @@ module HotBunnies
   class Exception < StandardError
   end
 
+  class ShutdownSignal < Exception
+    attr_reader :cause
+
+    def initialize(cause)
+      @cause = cause
+    end
+  end
+
   class NetworkException < Exception
   end
 

data/lib/hot_bunnies/session.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+require "hot_bunnies/shutdown_listener"
+
 module HotBunnies
   java_import com.rabbitmq.client.ConnectionFactory
   java_import com.rabbitmq.client.Connection
@@ -42,6 +45,8 @@ module HotBunnies
       new(cf)
     end
 
+    attr_reader :thread, :channels
+
 
     def initialize(connection_factory)
       @cf         = connection_factory
@@ -49,6 +54,8 @@ module HotBunnies
         self.new_connection
       end
       @channels   = ConcurrentHashMap.new
+
+      @thread     = Thread.current
     end
 
     def create_channel(n = nil)
@@ -72,6 +79,14 @@ module HotBunnies
       @connection.close
     end
 
+    def on_shutdown(&block)
+      sh = ShutdownListener.new(self, &block)
+      @connection.add_shutdown_listener(sh)
+
+      sh
+    end
+
+
     def flush
       @connection.flush
     end
@@ -84,6 +99,12 @@ module HotBunnies
       @connection.__send__(selector, *args)
     end
 
+    # @return [String]
+    # @api public
+    def to_s
+      "#<#{self.class.name}:#{object_id} #{@cf.username}@#{@cf.host}:#{@cf.port}, vhost=#{@cf.virtual_host}>"
+    end
+
 
     #
     # Implementation
@@ -164,6 +185,8 @@ module HotBunnies
         block.call
       rescue java.net.ConnectException => e
         raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused")
+      rescue java.net.UnknownHostException => e
+        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused: host unknown")
       rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
         raise PossibleAuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       end

data/lib/hot_bunnies/shutdown_listener.rb

@@ -0,0 +1,15 @@
+module HotBunnies
+  class ShutdownListener
+    include com.rabbitmq.client.ShutdownListener
+
+    def initialize(entity, &block)
+      # connection or channel
+      @entity = entity
+      @block  = block
+    end
+
+    def shutdown_completed(cause)
+      @block.call(@entity, cause)
+    end
+  end
+end

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = "2.0.0.pre6"
+  VERSION = "2.0.0.pre7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_bunnies
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre7
   prerelease: 6
 platform: java
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -30,6 +30,7 @@ files:
 - lib/hot_bunnies/metadata.rb
 - lib/hot_bunnies/queue.rb
 - lib/hot_bunnies/session.rb
+- lib/hot_bunnies/shutdown_listener.rb
 - lib/hot_bunnies/version.rb
 homepage: http://hotbunnies.info
 licenses: []