march_hare 3.0.0-java → 3.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24c5f476a2e6d0f317060d847bac5b3415a6af9e
-  data.tar.gz: cbd1a71d51155ca8898b89983c3409b08a914378
+SHA256:
+  metadata.gz: a1b5c3b68a7999e7a4395f7287ac7a31e05a2d79acd0da0d117339842c491946
+  data.tar.gz: 80484d5a1935a4348d4720293e49c05c89cad8778f0aad2fa28cf39b1bc081e3
 SHA512:
-  metadata.gz: 26dcc481444be82948f0234e493ab7c943e4f292e5f455e53acf1a1405b622846bf734d8f6bae3f10e06951b96ba760667fcc1a3e614484328fad7b61d486e87
-  data.tar.gz: 69586d383dacb082c63221b51fed78795d94d31377b77cf296cfd5a46b8ed348d39373916d75c617a70c450df09df87434f247396e842311abc61babc6c13089
+  metadata.gz: 160281080b5551e33ca042d868f5f57190f1a4b5997a0a7b3bc354d120826c5bdb999b07d820bb3c7598860c017bd03466449ae4f01d2d971500200a9997b15d
+  data.tar.gz: cad20d0d92a2ccd8e857e2755ca8e59b5b454926604ad72ea16174f43419af968f93b028d07225923912529163dbc61a177a44d3a49cc56688c8a6534c0e76d7

data/lib/march_hare/session.rb

@@ -10,10 +10,12 @@ module MarchHare
   java_import com.rabbitmq.client.BlockedListener
   java_import com.rabbitmq.client.NullTrustManager
   java_import com.rabbitmq.client.MissedHeartbeatException
+  java_import com.rabbitmq.client.Address
 
   java_import javax.net.ssl.SSLContext
   java_import javax.net.ssl.KeyManagerFactory
   java_import java.security.KeyStore
+  java_import javax.net.ssl.TrustManagerFactory
 
   # Connection to a RabbitMQ node.
   #
@@ -39,6 +41,8 @@ module MarchHare
     #
     # @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 [Array<String>] :hosts (["127.0.0.1"]) Array of hostnames or ips to connect to. The connection returned is the first in the array that succeeds.
+    # @option options [Array<String>] :addresses (["127.0.0.1:5672", "localhost:5673"]) Array of addresses to connect to. The connection returned is the first in the array that succeeds.
     # @option options [Integer] :port (5672) Port RabbitMQ listens on
     # @option options [String] :username ("guest") Username
     # @option options [String] :password ("guest") Password
@@ -55,6 +59,10 @@ module MarchHare
 
       if options[:uri]
         cf.uri          = options[:uri]          if options[:uri]
+      elsif options[:hosts] || options[:addresses]
+        cf.virtual_host = vhost_from(options)    if include_vhost?(options)
+        cf.username     = username_from(options) if include_username?(options)
+        cf.password     = password_from(options) if include_password?(options)
       else
         cf.host         = hostname_from(options) if include_host?(options)
         cf.port         = options[:port].to_i    if options[:port]
@@ -75,12 +83,11 @@ module MarchHare
       case tls
       when true then
         cf.use_ssl_protocol
-      when String then
+        when String then
         # TODO: logging
         $stdout.puts "Using TLS/SSL version #{tls}"
-        if options[:trust_manager]
-          cf.use_ssl_protocol(tls, options[:trust_manager])
-        elsif (cert_path = tls_certificate_path_from(options)) && (password = tls_certificate_password_from(options))
+        # Note: `options[:trust_manager] = com.rabbitmq.client.NullTrustManager.new` can be set to disable TLS verification.
+       if (cert_path = tls_certificate_path_from(options)) && (password = tls_certificate_password_from(options))
           ctx = SSLContext.get_instance(tls)
           pwd = password.to_java.to_char_array
           begin
@@ -91,7 +98,14 @@ module MarchHare
             kmf = KeyManagerFactory.get_instance("SunX509")
             kmf.init(ks, pwd)
 
-            ctx.init(kmf.get_key_managers, [NullTrustManager.new].to_java('javax.net.ssl.TrustManager'), nil)
+            if options[:trust_manager]
+              ctx.init(kmf.get_key_managers, [options[:trust_manager]], nil)
+            else
+              # use the key store as the trust store
+              tmf = TrustManagerFactory.get_instance(TrustManagerFactory.getDefaultAlgorithm());
+              tmf.init(ks)
+              ctx.init(kmf.get_key_managers, tmf.getTrustManagers(), nil)
+            end
 
             cf.use_ssl_protocol(ctx)
           rescue Java::JavaLang::Throwable => e
@@ -103,6 +117,8 @@ module MarchHare
           ensure
             is.close if is
           end
+        elsif options[:trust_manager]
+          cf.use_ssl_protocol(tls, options[:trust_manager])
         else
           cf.use_ssl_protocol(tls)
         end
@@ -137,15 +153,8 @@ module MarchHare
       # 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 }
-      @host_selection_strategy         = opts[:host_selection_strategy] || @default_host_selection_strategy
-
-      @connection       = if @uses_uri
-                            self.new_uri_connection_impl(@uri)
-                          else
-                            self.new_connection_impl(@hosts, @host_selection_strategy)
-                          end
+      @addresses        = self.class.adresses_from(opts)
+      @connection       = build_new_connection
       @channels         = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
@@ -273,13 +282,7 @@ module MarchHare
       java.lang.Thread.sleep(ms)
 
       new_connection = converting_rjc_exceptions_to_ruby do
-        reconnecting_on_network_failures(ms) do
-          if @uses_uri
-            self.new_uri_connection_impl(@uri)
-          else
-            self.new_connection_impl(@hosts, @host_selection_strategy)
-          end
-        end
+        reconnecting_on_network_failures(ms) { build_new_connection }
       end
       self.recover_shutdown_hooks(new_connection)
 
@@ -398,8 +401,8 @@ module MarchHare
     end
 
     # @private
-    def self.hosts_from(options)
-      options[:hosts] || [hostname_from(options)]
+    def self.adresses_from(options)
+      options[:addresses] || options[:hosts] || [hostname_from(options)]
     end
 
     # @private
@@ -497,6 +500,8 @@ module MarchHare
         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
         raise AuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
@@ -516,18 +521,21 @@ module MarchHare
     end
 
     # @private
-    def new_connection_impl(hosts, host_selector)
-      if hosts && !hosts.empty? && !@uses_uri
-        @cf.host = host_selector.call(hosts)
-      end
+    def build_new_connection
+      @uses_uri ? new_uri_connection_impl(@uri) : new_connection_impl(@addresses)
+    end
+
+    # @private
+    def new_connection_impl(addresses)
+      addrs = Address.parse_addresses(addresses.join(','))
 
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
           shut_down_executor_pool_and_await_timeout
           @executor = @executor_factory.call
-          @cf.new_connection(@executor)
+          @cf.new_connection(@executor, addrs)
         else
-          @cf.new_connection
+          @cf.new_connection(addrs)
         end
       end
     end

data/lib/march_hare/thread_pools.rb

@@ -6,27 +6,58 @@ module MarchHare
   class ThreadPools
     # Returns a new thread pool (JDK executor) of a fixed size.
     #
+    # @param [Integer] n Number of threads to use
+    #
+    # @option options [Boolean] :use_daemon_threads (false) Should new threads be marked as daemon?
+    #
     # @return A thread pool (JDK executor)
-    def self.fixed_of_size(n)
+    def self.fixed_of_size(n, use_daemon_threads: false)
       raise ArgumentError.new("n must be a positive integer!") unless Integer === n
       raise ArgumentError.new("n must be a positive integer!") unless n > 0
 
-      JavaConcurrent::Executors.new_fixed_thread_pool(n)
+      if use_daemon_threads
+        JavaConcurrent::Executors.new_fixed_thread_pool(n, &daemon_thread_factory)
+      else
+        JavaConcurrent::Executors.new_fixed_thread_pool(n)
+      end
     end
 
     # Returns a new thread pool (JDK executor) of a fixed size of 1.
     #
+    # @option options [Boolean] :use_daemon_threads (false) Should new threads be marked as daemon?
+    #
     # @return A thread pool (JDK executor)
-    def self.single_threaded
-      JavaConcurrent::Executors.new_single_thread_executor
+    def self.single_threaded(use_daemon_threads: false)
+      if use_daemon_threads
+        JavaConcurrent::Executors.new_single_thread_executor(&daemon_thread_factory)
+      else
+        JavaConcurrent::Executors.new_single_thread_executor
+      end
     end
 
     # Returns a new thread pool (JDK executor) that will create new
     # threads as needed.
     #
+    # @option options [Boolean] :use_daemon_threads (false) Should new threads be marked as daemon?
+    #
     # @return A thread pool (JDK executor)
-    def self.dynamically_growing
-      JavaConcurrent::Executors.new_cached_thread_pool
+    def self.dynamically_growing(use_daemon_threads: false)
+      if use_daemon_threads
+        JavaConcurrent::Executors.new_cached_thread_pool(&daemon_thread_factory)
+      else
+        JavaConcurrent::Executors.new_cached_thread_pool
+      end
+    end
+
+    # Returns a new thread factory that creates daemon threads.
+    #
+    # @option options [ThreadFactory] :base_factory Upstream thread factory used to create threads
+    #
+    # @return A thread factory
+    def self.daemon_thread_factory(base_factory: JavaConcurrent::Executors.default_thread_factory)
+      proc { |runnable|
+        base_factory.new_thread(runnable).tap { |t| t.daemon = true }
+      }
     end
   end
 end

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client