march_hare 4.0.0-java → 4.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bc17534b034049e19db4642f26c7062834d26cb31ef1ed191e70e9621a0b3f
-  data.tar.gz: 1635809c2a7f65d9d343e57fb34bc46b0df173065db6e64e98579ffcc61fc143
+  metadata.gz: d8fa8b82fb0e6e8a81f4734cc1aa5df2f4566b078b4b89485a915aa224cb0f68
+  data.tar.gz: fb24515cbd8e0e65e052d9fc1eedfb7c33423f7c5faf4fa6aae7445cb4285cbe
 SHA512:
-  metadata.gz: f292ea76e5912fdef5a1dc5016371632cb1a48679300bf3b603f313b718f424b1b690f92c7bb1285967175f2814a5fcb5a46187bc09467375bb174dbb5220485
-  data.tar.gz: 8aff2fb9a7c82779a6ac38a37ba71e09799aee1f1305ac7a2b3948101d48949c6226fedc827bab57f31946d058bc7f1a9866a5c9af86f366f0919321bff89e49
+  metadata.gz: 7d3cf202d16652aeb89b129c695ce42dbe0ddce9930ca259c612cb5f8fb0581eb1345b916393d9456798343ee9fdce3518885587250d478e7c000974929fe59c
+  data.tar.gz: 6563c124ce5a8817827526355d819bd6fbe585513c91164fc511576196b2f09c9ede5c246537f615848fb256149dd6ffaedef9b323bd62cb3d00be24d5c0129b

data/lib/march_hare/session.rb

@@ -165,7 +165,7 @@ module MarchHare
       # we expect this option to be specified in seconds
       @executor_shutdown_timeout = opts.fetch(:executor_shutdown_timeout, 30.0)
 
-      @addresses        = self.class.adresses_from(opts)
+      @addresses        = self.class.addresses_from(opts)
       @connection       = build_new_connection
       @channels         = JavaConcurrent::ConcurrentHashMap.new
 
@@ -458,7 +458,7 @@ module MarchHare
     end
 
     # @private
-    def self.adresses_from(options)
+    def self.addresses_from(options)
       options[:addresses] || options[:hosts] || [address_with_port_from(options)]
     end
 
@@ -541,6 +541,19 @@ module MarchHare
       !!opts[:thread_factory]
     end
 
+    # @private
+    def endpoint_info_from(cf)
+      if @uses_uri
+        uri_without_credentials = URI.parse(@uri).tap do |u|
+          u.password = "REDACTED"
+          u.to_s
+        end
+        "Target URI: #{uri_without_credentials}"
+      else
+        "Target host list: #{@addresses.join(', ')}, target virtual host: #{cf.virtual_host}, username: #{cf.username}"
+      end
+    end
+
     # Executes a block, catching Java exceptions RabbitMQ Java client throws and
     # transforms them to Ruby exceptions that are then re-raised.
     #
@@ -548,19 +561,19 @@ module MarchHare
     def converting_rjc_exceptions_to_ruby(&block)
       begin
         block.call
-      rescue java.net.ConnectException => e
-        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused")
-      rescue java.net.NoRouteToHostException => e
-        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} failed: no route to host")
-      rescue java.net.UnknownHostException => e
-        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused: host unknown")
-      rescue java.net.SocketException => e
-        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} failed")
-      rescue java.util.concurrent.TimeoutException => e
-        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} failed: timeout")
-      rescue com.rabbitmq.client.AuthenticationFailureException => e
+      rescue java.net.ConnectException
+        raise ConnectionRefused.new("Connection was refused. #{endpoint_info_from(@cf)}")
+      rescue java.net.NoRouteToHostException
+        raise ConnectionRefused.new("Connection failed: no route to target host. #{endpoint_info_from(@cf)}")
+      rescue java.net.UnknownHostException
+        raise ConnectionRefused.new("Connection refused: target host unknown (cannot be resolved). #{endpoint_info_from(@cf)}")
+      rescue java.net.SocketException
+        raise ConnectionRefused.new("Connection failed due to a socket exception. #{endpoint_info_from(@cf)}")
+      rescue java.util.concurrent.TimeoutException
+        raise ConnectionRefused.new("Connection timed out. #{endpoint_info_from(@cf)}")
+      rescue com.rabbitmq.client.AuthenticationFailureException
         raise AuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
-      rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
+      rescue com.rabbitmq.client.PossibleAuthenticationFailureException
         raise PossibleAuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       end
     end
@@ -570,7 +583,7 @@ module MarchHare
       @logger.debug("session: reconnecting_on_network_failures")
       begin
         fn.call
-      rescue IOError, MarchHare::ConnectionRefused, java.io.IOException, java.util.concurrent.TimeoutException => e
+      rescue IOError, MarchHare::ConnectionRefused, java.io.IOException, java.util.concurrent.TimeoutException
         java.lang.Thread.sleep(interval_in_ms)
 
         retry
@@ -579,8 +592,13 @@ module MarchHare
 
     # @private
     def build_new_connection
-      @logger.debug("session: instantiating a new connection")
-      @uses_uri ? new_uri_connection_impl(@uri) : new_connection_impl(@addresses)
+      if @uses_uri
+        @logger.debug("session: instantiating a new connection using a URI")
+        new_uri_connection_impl(@uri)
+      else
+        @logger.debug("session: instantiating a new connection using a set of addresses: #{@addresses.join(',')}")
+        new_connection_impl(@addresses)
+      end
     end
 
     # @private

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: