hot_bunnies 2.0.0.pre12-java → 2.0.0.pre13-java

data/lib/hot_bunnies/channel.rb

@@ -118,10 +118,9 @@ module HotBunnies
     attr_reader :consumers
 
     # @private
-    def initialize(session, delegate, thread_pool)
+    def initialize(session, delegate)
       @connection = session
       @delegate   = delegate
-      @thread_pool = thread_pool
 
       @exchanges      = JavaConcurrent::ConcurrentHashMap.new
       @queues         = JavaConcurrent::ConcurrentHashMap.new
@@ -403,7 +402,7 @@ module HotBunnies
     # @see http://hotbunnies.info/articles/queues.html Queues and Consumers guide
     # @see http://hotbunnies.info/articles/extensions.html RabbitMQ Extensions guide
     def queue(name, options={})
-      dq = Queue.new(self, name, @thread_pool, options).tap do |q|
+      dq = Queue.new(self, name, options).tap do |q|
         q.declare!
       end
 

data/lib/hot_bunnies/consumers.rb

@@ -1,4 +1,2 @@
-require "hot_bunnies/thread_pools"
-
 require "hot_bunnies/consumers/base"
 require "hot_bunnies/consumers/blocking"

data/lib/hot_bunnies/queue.rb

@@ -28,10 +28,9 @@ module HotBunnies
     # @see HotBunnies::Channel#queue
     # @see http://hotbunnies.info/articles/queues.html Queues and Consumers guide
     # @see http://hotbunnies.info/articles/extensions.html RabbitMQ Extensions guide
-    def initialize(channel, name, thread_pool, options={})
+    def initialize(channel, name, options={})
       @channel = channel
       @name = name
-      @thread_pool = thread_pool
       @options = {:durable => false, :exclusive => false, :auto_delete => false, :passive => false, :arguments => Hash.new}.merge(options)
 
       @durable      = @options[:durable]

data/lib/hot_bunnies/session.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "hot_bunnies/shutdown_listener"
 require "set"
+require "hot_bunnies/thread_pools"
 
 module HotBunnies
   java_import com.rabbitmq.client.ConnectionFactory
@@ -73,13 +74,10 @@ module HotBunnies
 
     # @private
     def initialize(connection_factory, opts = {})
-      @cf               = connection_factory
+      @cf = connection_factory
       @executor_factory = opts[:executor_factory]
-      @connection       = converting_rjc_exceptions_to_ruby do
-        self.new_connection
-      end
-      @channels    = JavaConcurrent::ConcurrentHashMap.new
-      @thread_pool = ThreadPools.dynamically_growing
+      @connection = self.new_connection
+      @channels = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -110,7 +108,7 @@ module HotBunnies
              @connection.create_channel
            end
 
-      ch = Channel.new(self, jc, @thread_pool)
+      ch = Channel.new(self, jc)
       register_channel(ch)
 
       ch
@@ -126,11 +124,6 @@ module HotBunnies
         ch.close
       end
 
-      @thread_pool.shutdown
-      unless @thread_pool.await_termination(5, JavaConcurrent::TimeUnit::SECONDS)
-        @thread_pool.shutdown_now
-      end
-
       @connection.close
     end
 
@@ -171,11 +164,14 @@ module HotBunnies
     # Begins automatic connection recovery (typically only used internally
     # to recover from network failures)
     def automatically_recover
+      ms = @network_recovery_interval * 1000
       # recovering immediately makes little sense. Wait a bit first. MK.
-      java.lang.Thread.sleep(@network_recovery_interval * 1000)
+      java.lang.Thread.sleep(ms)
 
       @connection = converting_rjc_exceptions_to_ruby do
-        self.new_connection
+        reconnecting_on_network_failures(ms) do
+          self.new_connection
+        end
       end
       @thread_pool = ThreadPools.dynamically_growing
       self.recover_shutdown_hooks
@@ -326,12 +322,22 @@ module HotBunnies
       end
     end
 
+    # @private
+    def reconnecting_on_network_failures(interval_in_ms, &fn)
+      begin
+        fn.call
+      rescue IOError, HotBunnies::ConnectionRefused, java.io.IOException => e
+        java.lang.Thread.sleep(interval_in_ms)
+
+        retry
+      end
+    end
+
     # @private
     def new_connection
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
-          ex = @executor_factory.call
-          @cf.new_connection(ex)
+          @cf.new_connection(@executor_factory.call)
         else
           @cf.new_connection
         end

data/lib/hot_bunnies/thread_pools.rb

@@ -1,3 +1,5 @@
+require "hot_bunnies/juc"
+
 module HotBunnies
   # A slighly more Ruby developer-friendly way of instantiating various
   # JDK executors (thread pools).

data/lib/hot_bunnies/version.rb

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

data/lib/hot_bunnies.rb

@@ -6,7 +6,6 @@ require 'ext/rabbitmq-client'
 
 require 'hot_bunnies/version'
 require 'hot_bunnies/exceptions'
-require 'hot_bunnies/thread_pools'
 require 'hot_bunnies/session'
 
 # HotBunnies is a JRuby client for RabbitMQ built on top of the official Java client.

metadata

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