RUBY-639 socket connect timeouts throw ConnectionTimeoutError

Author: estolfo

lib/mongo/util/node.rb

@@ -65,7 +65,8 @@ def connect
                                              @client.op_timeout,
                                              @client.connect_timeout,
                                              @client.socket_opts)
-        rescue OperationTimeout, ConnectionFailure, OperationFailure, SocketError, SystemCallError, IOError => ex
+        rescue ConnectionTimeoutError, OperationTimeout, ConnectionFailure, OperationFailure,
+               SocketError, SystemCallError, IOError => ex
           @client.log(:debug, "Failed connection to #{host_string} with #{ex.class}, #{ex.message}.")
           close
         end

lib/mongo/util/ssl_socket.rb

@@ -67,7 +67,7 @@ def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
 
     def connect
       if @connect_timeout
-        Timeout::timeout(@connect_timeout, OperationTimeout) do
+        Timeout::timeout(@connect_timeout, ConnectionTimeoutError) do
           @socket.connect
         end
       else

lib/mongo/util/tcp_socket.rb

@@ -42,7 +42,7 @@ def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
 
     def connect
       if @connect_timeout
-        Timeout::timeout(@connect_timeout, OperationTimeout) do
+        Timeout::timeout(@connect_timeout, ConnectionTimeoutError) do
           @socket.connect(@socket_address)
         end
       else