march_hare 2.5.1-java → 2.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d812346b01209ab8c2ddb64200f1a9e6d8a7488
-  data.tar.gz: e8031aea2ef38e5ed724c1102fe03f8e310b5f28
+  metadata.gz: 8a417da5f5c33e7afac262924967c49e0910c6a8
+  data.tar.gz: 8bfcf751a299b57a60bf6bcd87260626ebc3d983
 SHA512:
-  metadata.gz: 7d6d22f26143b7fd68b8bb4d4d4e73710675749d8da597171c4ea86e442b947d72177db5244685aa7d72365e4e5873527794176caa1f81ef91bb42519a871e75
-  data.tar.gz: be9a1cbf79c8027b5193130d9fdabbcce82efe93bffd4bf3d3d03521a74ed01582068e8ad5f180c436005de63e114af74e3cead616d8bac174007cc01af87ec1
+  metadata.gz: f3af5dfa114500351fbaeece4d3d34cec7d73e5b6465880870d46cdef3ac9e25a0166a2fb6c884ae7ca9d9b3ece0871c9d3f98b85f5070f01b9c3aa7ca39bd71
+  data.tar.gz: ab7451d9f4621f5da10264af369558b94968a5772af9af282b0a5d0ce27123011822a00823d297ee419d3603ad4aa14da83c09ec1c4a4ce50127093e09f0a95e

data/lib/march_hare/session.rb

@@ -83,7 +83,12 @@ 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)
-      @connection       = self.new_connection_impl
+
+      @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       = self.new_connection_impl(@hosts, @host_selection_strategy)
       @channels         = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
@@ -199,7 +204,7 @@ module MarchHare
 
       new_connection = converting_rjc_exceptions_to_ruby do
         reconnecting_on_network_failures(ms) do
-          self.new_connection_impl
+          self.new_connection_impl(@hosts, @host_selection_strategy)
         end
       end
       @thread_pool = ThreadPools.dynamically_growing
@@ -289,6 +294,11 @@ module MarchHare
       options[:host] || options[:hostname] || ConnectionFactory::DEFAULT_HOST
     end
 
+    # @private
+    def self.hosts_from(options)
+      options[:hosts] || [hostname_from(options)]
+    end
+
     # @private
     def self.include_host?(options)
       !!(options[:host] || options[:hostname])
@@ -378,8 +388,12 @@ module MarchHare
         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 com.rabbitmq.client.AuthenticationFailureException => e
         raise AuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
@@ -399,7 +413,11 @@ module MarchHare
     end
 
     # @private
-    def new_connection_impl
+    def new_connection_impl(hosts, host_selector)
+      if hosts && !hosts.empty?
+        @cf.host = host_selector.call(hosts)
+      end
+
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
           @executor = @executor_factory.call

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.7.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -21,7 +21,6 @@ extra_rdoc_files: []
 files:
 - lib/ext/commons-io.jar
 - lib/ext/rabbitmq-client.jar
-- lib/hot_bunnies.rb
 - lib/march_hare.rb
 - lib/march_hare/channel.rb
 - lib/march_hare/consumers.rb
@@ -56,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client

data/lib/hot_bunnies.rb

@@ -1,2 +0,0 @@
-# Backwards compatibility
-require "march_hare"