Hiredis: don't use redisReconnect if the config changed

Author: byroot

hiredis-client/lib/redis_client/hiredis_connection.rb

@@ -39,11 +39,8 @@ def initialize(ca_file: nil, ca_path: nil, cert: nil, key: nil, hostname: nil)
       end
     end
 
-    attr_reader :config
-
     def initialize(config, connect_timeout:, read_timeout:, write_timeout:)
-      super()
-      @config = config
+      super(config)
       self.connect_timeout = connect_timeout
       self.read_timeout = read_timeout
       self.write_timeout = write_timeout
@@ -136,7 +133,7 @@ def write_multi(commands)
     def connect
       _connect(@config.path, @config.host, @config.port, @config.ssl_context)
     rescue SystemCallError => error
-      host = @config.path || "#{@config.host}:#{@config.port}"
+      host = @path || "#{@host}:#{@port}"
       error_code = error.class.name.split("::").last
       raise CannotConnectError, "Failed to connect to #{host} (#{error_code})"
     end

lib/redis_client.rb

@@ -786,7 +786,7 @@ def raw_connection
   def connect
     @pid = PIDCache.pid
 
-    if @raw_connection
+    if @raw_connection && @raw_connection.revalidate
       @middlewares.connect(config) do
         @raw_connection.reconnect
       end

lib/redis_client/connection_mixin.rb

@@ -3,10 +3,15 @@
 class RedisClient
   module ConnectionMixin
     attr_accessor :retry_attempt
+    attr_reader :config
 
-    def initialize
+    def initialize(config)
       @pending_reads = 0
       @retry_attempt = nil
+      @config = config
+      @path = @config.path
+      @host = @config.host
+      @port = @config.port
     end
 
     def reconnect
@@ -20,7 +25,7 @@ def close
     end
 
     def revalidate
-      if @pending_reads > 0
+      if @pending_reads > 0 && !config_changed?
         close
         false
       else
@@ -97,5 +102,11 @@ def connection_error(message)
       error._set_retry_attempt(@retry_attempt)
       error
     end
+
+    private
+
+    def config_changed?
+      !(@path == @config.path && @host == @config.host && @port == @config.port)
+    end
   end
 end

lib/redis_client/ruby_connection.rb

@@ -40,11 +40,8 @@ def ssl_context(ssl_params)
 
     SUPPORTS_RESOLV_TIMEOUT = Socket.method(:tcp).parameters.any? { |p| p.last == :resolv_timeout }
 
-    attr_reader :config
-
     def initialize(config, connect_timeout:, read_timeout:, write_timeout:)
-      super()
-      @config = config
+      super(config)
       @connect_timeout = connect_timeout
       @read_timeout = read_timeout
       @write_timeout = write_timeout