Merge pull request #707 from estolfo/RUBY-1052-connect-timeout

RUBY-1052 Use connect_timeout as the timeout for a server monitor's socket

Author: estolfo

lib/mongo/server/connectable.rb

@@ -25,7 +25,7 @@ module Connectable
       # @since 2.1.0
       SSL = 'ssl'.freeze
 
-      # The default time in seconds to timeout a connection attempt.
+      # The default time in seconds to timeout an operation executed on a socket.
       #
       # @since 2.0.0
       TIMEOUT = 5.freeze
@@ -64,12 +64,12 @@ def connected?
         !!@socket && @socket.alive?
       end
 
-      # Get the connection timeout.
+      # Get the timeout to execute an operation on a socket.
       #
-      # @example Get the connection timeout.
+      # @example Get the timeout to execute an operation on a socket.
       #   connection.timeout
       #
-      # @return [ Float ] The connection timeout in seconds.
+      # @return [ Float ] The operation timeout in seconds.
       #
       # @since 2.0.0
       def timeout

lib/mongo/server/monitor/connection.rb

@@ -22,6 +22,23 @@ class Monitor
       class Connection
         include Connectable
 
+        # The default time in seconds to timeout a connection attempt.
+        #
+        # @since 2.1.2
+        CONNECT_TIMEOUT = 10.freeze
+
+        # Get the connection timeout.
+        #
+        # @example Get the connection timeout.
+        #   connection.timeout
+        #
+        # @return [ Float ] The connection timeout in seconds.
+        #
+        # @since 2.0.0
+        def timeout
+          @timeout ||= options[:connect_timeout] || CONNECT_TIMEOUT
+        end
+
         # Tell the underlying socket to establish a connection to the host.
         #
         # @example Connect to the host.

spec/mongo/server/monitor_spec.rb

@@ -192,4 +192,27 @@
       expect(thread.stop?).to be(true)
     end
   end
+
+  describe '#connection' do
+
+    context 'when there is a connect_timeout option set' do
+
+      let(:connect_timeout) do
+        1
+      end
+
+      let(:monitor) do
+        described_class.new(address, listeners, TEST_OPTIONS.merge(connect_timeout: connect_timeout))
+      end
+
+      it 'sets the value as the timeout on the connection' do
+        expect(monitor.connection.timeout).to eq(connect_timeout)
+      end
+
+      it 'set the value as the timeout on the socket' do
+        monitor.connection.connect!
+        expect(monitor.connection.send(:socket).timeout).to eq(connect_timeout)
+      end
+    end
+  end
 end