Merge pull request #464 from csfrancis/add_connect_timeout

Add :connect_timeout option

Author: djanowski

lib/redis/client.rb

@@ -12,6 +12,7 @@ class Client
       :port => 6379,
       :path => nil,
       :timeout => 5.0,
+      :connect_timeout => 5.0,
       :password => nil,
       :db => 0,
       :driver => nil,
@@ -408,6 +409,12 @@ def _parse_options(options)
       end
 
       options[:timeout] = options[:timeout].to_f
+      options[:connect_timeout] = if options[:connect_timeout]
+        options[:connect_timeout].to_f
+      else
+        options[:timeout]
+      end
+
       options[:db] = options[:db].to_i
       options[:driver] = _parse_driver(options[:driver]) || Connection.drivers.last
 

lib/redis/connection/hiredis.rb

@@ -11,9 +11,9 @@ def self.connect(config)
         connection = ::Hiredis::Connection.new
 
         if config[:scheme] == "unix"
-          connection.connect_unix(config[:path], Integer(config[:timeout] * 1_000_000))
+          connection.connect_unix(config[:path], Integer(config[:connect_timeout] * 1_000_000))
         else
-          connection.connect(config[:host], config[:port], Integer(config[:timeout] * 1_000_000))
+          connection.connect(config[:host], config[:port], Integer(config[:connect_timeout] * 1_000_000))
         end
 
         instance = new(connection)

lib/redis/connection/ruby.rb

@@ -206,9 +206,9 @@ class Ruby
 
       def self.connect(config)
         if config[:scheme] == "unix"
-          sock = UNIXSocket.connect(config[:path], config[:timeout])
+          sock = UNIXSocket.connect(config[:path], config[:connect_timeout])
         else
-          sock = TCPSocket.connect(config[:host], config[:port], config[:timeout])
+          sock = TCPSocket.connect(config[:host], config[:port], config[:connect_timeout])
         end
 
         instance = new(sock)

lib/redis/connection/synchrony.rb

@@ -70,7 +70,7 @@ def self.connect(config)
           conn = EventMachine.connect_unix_domain(config[:path], RedisClient)
         else
           conn = EventMachine.connect(config[:host], config[:port], RedisClient) do |c|
-            c.pending_connect_timeout = [config[:timeout], 0.1].max
+            c.pending_connect_timeout = [config[:connect_timeout], 0.1].max
           end
         end
 

test/internals_test.rb

@@ -152,9 +152,12 @@ def test_time
   end
 
   def test_connection_timeout
+    opts = OPTIONS.merge(:host => "10.255.255.254", :connect_timeout => 0.1, :timeout => 5.0)
+    start_time = Time.now
     assert_raise Redis::CannotConnectError do
-      Redis.new(OPTIONS.merge(:host => "10.255.255.254", :timeout => 0.1)).ping
+      Redis.new(opts).ping
     end
+    assert (Time.now - start_time) <= opts[:timeout]
   end
 
   def close_on_ping(seq, options = {})