march_hare 4.1.1-java → 4.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4991f2f1adcdad91fecd0e645b2d0c289292c12532a455e9df50745c28101eb9
-  data.tar.gz: 65e579a293592cfd3047e66d5e109a7702ff881612b3c283d39de852a9a1f248
+  metadata.gz: 422e907691c9a23c9b3c34a399af78305115a4918f2a1d988bc333f0f46d21d6
+  data.tar.gz: 6423305f0730974e723e357954b0c430de23ee2b06548c477353c82e067df16e
 SHA512:
-  metadata.gz: 13bdf0f2f0ea8ed22744f1e49d5f1446e7e08943b46876fbb9336902fe3274c928399464fa1830272a1cf2240e4f8b9a0e160f5b7890682efb9db25f4b9bc85b
-  data.tar.gz: 7769151208e32f5a7bff6ea352d9fece4788b1f70da749b882cc369eec93dbeffed80952ce57c4575b4206e464ded9a05777ef976c2101863452ba56fefd6769
+  metadata.gz: 34431c6bb05c6ca03afa1f8181ab7dca28650be1e4188c854c28eb4d455825d12b620e0d2e4fbb87bff4f100876559b3cc07a1e1a47c18a5e63e531f14767288
+  data.tar.gz: 7965a6a8edcad1a181b00d6d016816370a7654dfb9321777ddf3ee7895ec948afceccfcf07319e7a9d6eb6bcdb4f619be76bdf76b5b9b557c7c4d522ffe572a3

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/session.rb

@@ -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.1"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2020-05-06 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