Pass on all options to Sentinels and fetched nodes

Author: badboy

lib/redis/client.rb

@@ -317,9 +317,9 @@ def establish_connection
       server = @connector.resolve.dup
 
       @options[:host] = server[:host]
-      @options[:port] = server[:port]
+      @options[:port] = Integer(server[:port])
 
-      @connection = @options[:driver].connect(server)
+      @connection = @options[:driver].connect(@options)
       @pending_reads = 0
     rescue TimeoutError,
            Errno::ECONNREFUSED,
@@ -470,7 +470,7 @@ def _parse_driver(driver)
 
     class Connector
       def initialize(options)
-        @options = options
+        @options = options.dup
       end
 
       def resolve
@@ -484,9 +484,9 @@ class Sentinel < Connector
         def initialize(options)
           super(options)
 
-          @sentinels = options.fetch(:sentinels).dup
-          @role = options.fetch(:role, "master").to_s
-          @master = options[:host]
+          @sentinels = @options.delete(:sentinels).dup
+          @role = @options.fetch(:role, "master").to_s
+          @master = @options[:host]
         end
 
         def check(client)
@@ -521,7 +521,10 @@ def resolve
 
         def sentinel_detect
           @sentinels.each do |sentinel|
-            client = Client.new(:host => sentinel[:host], :port => sentinel[:port], :timeout => 0.3)
+            client = Client.new(@options.merge({
+              :host => sentinel[:host],
+              :port => sentinel[:port]
+            }))
 
             begin
               if result = yield(client)

lib/redis/connection/hiredis.rb

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