ridley-connectors 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599c5217df3e7254b4578d86c7ea5d2cff2642d2
-  data.tar.gz: dd25c405a8e4d04d49841830d2d052ed4149a126
+  metadata.gz: e88e7d1466ed5f5f4eba7ab10027d7de1bab2a1a
+  data.tar.gz: 524114a995de24ce56a8e196116f438ad0f94c22
 SHA512:
-  metadata.gz: 586525058a7a8db6d445f7a613a70099b6751b9d3d4958f631e680b70b58f69b97fb2ba90ec773145c4e2c063b9be9ed795e073571eacaeef009c82f04e0e907
-  data.tar.gz: b66f344b598132790cf6b927f54af4763100a27e9bc358ac79d50b3e549152b5af9145fad8ced11c99672ff76f13bacc21c60cc4bd72530db4d262c5ecbe47bf
+  metadata.gz: b7f907f07d2754a34fbfa7e21dfebddb0fdc22eeeebcbc646bcd791d3ff9636cb60624eb8bc7d34b5084b2795857ff0c7dce600598f5225dcf9344b74f9d9fb7
+  data.tar.gz: b077c34a56b4a0f2d5631fe9e277d1bf8c716d41757011746f29dc311ca0387312da5c19e7bf4259de3a52b833f31689949a62034eb1824b7ffce468715a2c67

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.1.7.1
+
+* [#16](https://github.com/RiotGames/ridley-connectors/pull/16) JRuby throws different exceptions when it can't connect to a node
+
 ## v.1.7.0
 
 * [#15](https://github.com/RiotGames/ridley-connectors/pull/15) Add retries to ssh and winrm connections

data/lib/ridley-connectors/host_commander.rb

@@ -1,10 +1,15 @@
+require 'buff/ruby_engine'
+
 module Ridley
   class ConnectorSupervisor < ::Celluloid::SupervisionGroup
+    include Ridley::Logging
+
     # @param [Celluloid::Registry] registry
     def initialize(registry, connector_pool_size)
       super(registry)
 
       if connector_pool_size > 1
+        log.info { "Host ConnectorSupervisor pool starting with size: #{connector_pool_size}" }
         pool(HostConnector::SSH, size: connector_pool_size, as: :ssh)
         pool(HostConnector::WinRM, size: connector_pool_size, as: :winrm)
       else
@@ -21,6 +26,15 @@ module Ridley
     PORT_CHECK_TIMEOUT = 3
     RETRY_COUNT = 3
 
+    CONNECTOR_PORT_ERRORS = [
+      Errno::ETIMEDOUT, Timeout::Error, SocketError, 
+      Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL
+    ]
+
+    if Buff::RubyEngine.jruby?
+      CONNECTOR_PORT_ERRORS << Java::JavaNet::ConnectException
+    end
+
     finalizer :finalize_callback
 
     def initialize(connector_pool_size=nil)
@@ -226,7 +240,7 @@ module Ridley
           defer {
             Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
           }
-        rescue Errno::ETIMEDOUT, Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
+        rescue *CONNECTOR_PORT_ERRORS => ex
           @retry_count -= 1
           retry if @retry_count > 0
           false

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = '1.7.0'
+    VERSION = '1.7.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Jamie Winsor