march_hare 4.1.0-java → 4.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8fa8b82fb0e6e8a81f4734cc1aa5df2f4566b078b4b89485a915aa224cb0f68
-  data.tar.gz: fb24515cbd8e0e65e052d9fc1eedfb7c33423f7c5faf4fa6aae7445cb4285cbe
+  metadata.gz: 3515365e0557a86fbd8e420d7fdbe43aa18c063fc34d86d94f5af449d0f1fa0c
+  data.tar.gz: da9a5a017bfcff8f29452a33cba121ff7dea8a9c0db2fa1eb56bd5fbe9f94e8a
 SHA512:
-  metadata.gz: 7d3cf202d16652aeb89b129c695ce42dbe0ddce9930ca259c612cb5f8fb0581eb1345b916393d9456798343ee9fdce3518885587250d478e7c000974929fe59c
-  data.tar.gz: 6563c124ce5a8817827526355d819bd6fbe585513c91164fc511576196b2f09c9ede5c246537f615848fb256149dd6ffaedef9b323bd62cb3d00be24d5c0129b
+  metadata.gz: 9df022f62afcef6c1aec7e8355fe1eb2e7b891d4efb51bd644fc5fafff2633e1cf21d8a7b08924baf04874c20e1bae9c43a393e0d0c2f3f1656bca8b649673f8
+  data.tar.gz: d8bb0b7c50e50c1ea78a23ae652c66c424f073785c95573b1f365ec11ea84959ea607cb7e9eee1394a66a5702d32ad6b8d2f5ddb90242316d847bfa2e1d00aa6

data/lib/march_hare/exceptions.rb

@@ -16,6 +16,12 @@ module MarchHare
   class ConnectionRefused < NetworkException
   end
 
+  class ConnectionClosedException < Exception
+    def initialize(message='')
+      super("Connection was explicitly closed and cannot be reopened. Create a new Connection instead. #{message}")
+    end
+  end
+
   class ChannelLevelException < Exception
     attr_reader :channel_close
 

data/lib/march_hare/metadata.rb

@@ -86,7 +86,7 @@ module MarchHare
       elsif value.is_a?(java.util.List)
         value.map {|v| deep_normalize_headers(v)}
       else
-        if value.java_kind_of?(LONG_STRING_TYPE)
+        if value.kind_of?(LONG_STRING_TYPE)
           value.to_s
         else
           value

data/lib/march_hare/session.rb

@@ -88,7 +88,7 @@ module MarchHare
       when true then
         cf.use_ssl_protocol
       when String then
-        opts[:logger].info("Using TLS/SSL version #{tls}") if opts[:logger]
+        options[:logger].info("Using TLS/SSL version #{tls}") if options[:logger]
         # Note: `options[:trust_manager] = com.rabbitmq.client.TrustEverythingTrustManager.new`
         # can be set to effectively disable TLS verification.
         if (cert_path = tls_certificate_path_from(options)) && (password = tls_certificate_password_from(options))
@@ -103,7 +103,7 @@ module MarchHare
             kmf.init(ks, pwd)
 
             if options[:trust_manager]
-              ctx.init(kmf.get_key_managers, [options[:trust_manager]], nil)
+              ctx.init(kmf.get_key_managers, Array(options[:trust_manager]), nil)
             else
               # use the key store as the trust store
               tmf = TrustManagerFactory.get_instance(TrustManagerFactory.getDefaultAlgorithm());
@@ -111,6 +111,7 @@ module MarchHare
               ctx.init(kmf.get_key_managers, tmf.getTrustManagers(), nil)
             end
 
+            cf.set_sasl_config(options[:sasl_config]) if options[:sasl_config]
             cf.use_ssl_protocol(ctx)
           rescue Java::JavaLang::Throwable => e
             message = e.message
@@ -179,6 +180,7 @@ module MarchHare
       @shutdown_hooks            = Array.new
       @blocked_connection_hooks  = Array.new
       @connection_recovery_hooks = Array.new
+      @was_explicitly_closed     = false
 
       if @automatically_recover
         self.add_automatic_recovery_hook
@@ -224,8 +226,16 @@ module MarchHare
         ch.close
       end
 
+      @was_explicitly_closed = true
       maybe_shut_down_executor
       @connection.close
+    rescue com.rabbitmq.client.AlreadyClosedException
+      @logger.debug("close: connection already closed")
+    end
+
+    def reopen
+      @was_explicitly_closed = false
+      automatically_recover
     end
 
     # @return [Boolean] true if connection is open, false otherwise
@@ -317,7 +327,8 @@ module MarchHare
     # Begins automatic connection recovery (typically only used internally
     # to recover from network failures)
     def automatically_recover
-      @logger.debug("session: begin automatic connection recovery")
+      raise ConnectionClosedException if @was_explicitly_closed
+      @logger.debug("session: begin automatic connection recovery #{Thread.current.inspect}")
 
       fire_recovery_start_hooks
 
@@ -582,6 +593,7 @@ module MarchHare
     def reconnecting_on_network_failures(interval_in_ms, &fn)
       @logger.debug("session: reconnecting_on_network_failures")
       begin
+        return if @was_explicitly_closed
         fn.call
       rescue IOError, MarchHare::ConnectionRefused, java.io.IOException, java.util.concurrent.TimeoutException
         java.lang.Thread.sleep(interval_in_ms)

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.4.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -56,7 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: march_hare
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client