march_hare 2.18.0-java → 2.19.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2076b8b72612200ebc8693e5892120ea11f3b1f3
-  data.tar.gz: 4f2063a3b9abcb4df84922abffe67de36cac90c2
+  metadata.gz: 8dc736328193c189024f9025c51e1950be461b72
+  data.tar.gz: 8c7997571606bddc54fefd82f4902cddda6b0605
 SHA512:
-  metadata.gz: c01d61b114229154a305f1ea9f962b0417183730f66d53f4b63ccdd82d218b1c573745a7ac93b526406f637e48709595af223bd116315c0fee445a3ea98eb242
-  data.tar.gz: a383c7dd10a7524881d62e88d18e3e08224317e2a852809b8b713b7acb85663039684514f48f5f9d69a18352636fdb1b3c326c1ab62507d8b8823558f157d50d
+  metadata.gz: 689c4fb17b918f9a1d7b46810ae034d0f39a5e1a57fa5bf3690da5d57382b2aac8752ae6a4f9ad98d95a41fc653e52531b1d9337c2e24b05d2525beecb6b9001
+  data.tar.gz: 84bf5d5c28da7fb429024f6978243362f075f31fbb1b14fd8856f4478db2ad6f64816adfe380a11eb0ea4b1a0726491a0caeb53dc285dad9751a9c27723267a4

data/lib/march_hare/channel.rb

@@ -226,19 +226,19 @@ module MarchHare
     # Recovery feature.
     #
     def recover_prefetch_setting
-      basic_qos(@prefetch_count) if @prefetch_count
+      basic_qos(@prefetch_count) if defined?(@prefetch_count) && @prefetch_count
     end
 
     # Recovers publisher confirms mode. Used by the Automatic Network Failure
     # Recovery feature.
     def recover_confirm_mode
-      confirm_select if @confirm_mode
+      confirm_select if defined?(@confirm_mode) && @confirm_mode
     end
 
     # Recovers transaction mode. Used by the Automatic Network Failure
     # Recovery feature.
     def recover_tx_mode
-      tx_select if @tx_mode
+      tx_select if defined?(@tx_mode) && @tx_mode
     end
 
     # Recovers exchanges. Used by the Automatic Network Failure

data/lib/march_hare/exchange.rb

@@ -57,7 +57,7 @@ module MarchHare
     # @option opts [Boolean] :mandatory Should the message be returned if it cannot be routed to any queue?
     # @option opts [Hash] :properties Messages and delivery properties
     #
-    #  * :timestamp (Integer) A timestamp associated with this message
+    #  * :timestamp (Time) A timestamp associated with this message
     #  * :expiration (Integer) Expiration time after which the message will be deleted
     #  * :type (String) Message type, e.g. what type of event or command this message represents. Can be any string
     #  * :reply_to (String) Queue name other apps should send the response to

data/lib/march_hare/queue.rb

@@ -143,7 +143,7 @@ module MarchHare
       @channel.queue_purge(@name)
     end
 
-    def get(options = {:block => false})
+    def get(options = {})
       response = @channel.basic_get(@name, !options.fetch(:ack, false))
 
       if response

data/lib/march_hare/session.rb

@@ -36,6 +36,7 @@ module MarchHare
     #
     # @param [Hash] options Connection options
     #
+    # @option options [Numeric] :executor_shutdown_timeout (30.0) when recovering from a network failure how long should we wait for the current threadpool to finish handling its messages
     # @option options [String] :host ("127.0.0.1") Hostname or IP address to connect to
     # @option options [Integer] :port (5672) Port RabbitMQ listens on
     # @option options [String] :username ("guest") Username
@@ -125,6 +126,8 @@ module MarchHare
       # executors cannot be restarted after shutdown,
       # so we really need a factory here. MK.
       @executor_factory = opts[:executor_factory] || build_executor_factory_from(opts)
+      # we expect this option to be specified in seconds
+      @executor_shutdown_timeout = opts.fetch(:executor_shutdown_timeout, 30.0)
 
       @hosts            = self.class.hosts_from(opts)
       @default_host_selection_strategy = lambda { |hosts| hosts.sample }
@@ -165,6 +168,14 @@ module MarchHare
            else
              @connection.create_channel
            end
+      if jc.nil?
+        error_message = <<-MSG
+          Unable to create a channel. This is likely due to having a channel_max setting
+          on the rabbitmq broker (see https://www.rabbitmq.com/configure.html).
+          There are currently #{@channels.size} channels on this connection.
+        MSG
+        raise ::MarchHare::ChannelError.new(error_message, false)
+      end
 
       ch = Channel.new(self, jc)
       register_channel(ch)
@@ -238,7 +249,7 @@ module MarchHare
 
     # @private
     def disable_automatic_recovery
-      @connetion.remove_shutdown_listener(@automatic_recovery_hook) if @automatic_recovery_hook
+      @connection.remove_shutdown_listener(@automatic_recovery_hook) if @automatic_recovery_hook
     end
 
     # Begins automatic connection recovery (typically only used internally
@@ -257,7 +268,6 @@ module MarchHare
           end
         end
       end
-      @thread_pool = ThreadPools.dynamically_growing
       self.recover_shutdown_hooks(new_connection)
 
       # sorting channels by id means that the cases like the following:
@@ -499,6 +509,7 @@ module MarchHare
 
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
+          shut_down_executor_pool_and_await_timeout
           @executor = @executor_factory.call
           @cf.new_connection(@executor)
         else
@@ -512,6 +523,7 @@ module MarchHare
       @cf.uri = uri
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
+          shut_down_executor_pool_and_await_timeout
           @executor = @executor_factory.call
           @cf.new_connection(@executor)
         else
@@ -522,7 +534,18 @@ module MarchHare
 
     # @private
     def maybe_shut_down_executor
-      @executor.shutdown if @executor
+      @executor.shutdown if defined?(@executor) && @executor
+    end
+
+    def shut_down_executor_pool_and_await_timeout
+      return unless defined?(@executor) && @executor
+      ms_to_wait = (@executor_shutdown_timeout * 1000).to_i
+      @executor.shutdown()
+      unless @executor.awaitTermination(ms_to_wait, java.util.concurrent.TimeUnit::MILLISECONDS)
+        @executor.shutdownNow()
+      end
+    rescue java.lang.InterruptedException
+      #no op, just means we got a forced shutdown
     end
 
     # Makes it easier to construct executor factories.

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.18.0"
+  VERSION = "2.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client