redis-client 0.26.3 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1158a824b42ce5297ff9eb38755a9af61ccc3635f6f201e17708e91ffc8b230
-  data.tar.gz: 8c8ffd7afa1672760e628ae6725f02b614588a963288dd55cb8fc2b5db43ed82
+  metadata.gz: 154a0c259fc2b3ccd21836d769541db74daef95be9d2e235a36c15b8b6d68d3b
+  data.tar.gz: 5f27693c2903da092547ad8f4362a1573e8527d9ef38266074c389574523971b
 SHA512:
-  metadata.gz: 2ba91ae532685d186151cc2a2b3b9d2cc485968a4b4aafb765fae2bce0046d962776dd5dd9ba783c9baae7425d785af9600d28b22befaf982ea90689ec373242
-  data.tar.gz: 373343251df2027cb19ab4fab1cdc63de4b5d2f2ca5bcc2542e9486818bbc93b6b88da63d34a1db63044f4adba690b4d2f534390acb8c2739a633c9b6bfcda42
+  metadata.gz: ca23aa033f2142cd608cf6197a35b0e32c89f1240344853be148b9eefbec330bbf1a8507277c822482455a8e7198abec888ce73c1f842382d5ebc826c417c5d2
+  data.tar.gz: e5f2086185d04e12462dc176a3c90084d7a7b04c520f906dcdb6024a1a42a6d7b418d5c94951628062a746ed0a0426add0970d877587f6b3d25843baf2c0a780

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# 0.26.4
+
+- Further improve `rediss://` URLs used with Redis sentinel. Now avoid override explictly set `ssl:` paramter.
+- Fix compatibility with `redis-rb` in sentinel mode.
+
 # 0.26.3
 
 - Fix `rediss://` (ssl) URLs used with Redis sentinel.

data/lib/redis_client/sentinel_config.rb

@@ -22,6 +22,9 @@ class RedisClient
         raise ArgumentError, "Expected role to be either :master or :replica, got: #{role.inspect}"
       end
 
+      # Track whether SSL was explicitly provided by user
+      ssl_explicitly_set = client_config.key?(:ssl)
+
       if url
         url_config = URLConfig.new(url)
         client_config = {
@@ -68,7 +71,9 @@ class RedisClient
       client_config[:reconnect_attempts] ||= DEFAULT_RECONNECT_ATTEMPTS
       @client_config = client_config || {}
       @sentinel_client_config = @client_config.dup
-      @sentinel_client_config.delete(:ssl)
+      # Only remove SSL from sentinel config if it was derived from URL,
+      # not if explicitly set by user.
+      @sentinel_client_config.delete(:ssl) unless ssl_explicitly_set
       super(**client_config)
       @sentinel_configs = sentinels_to_configs(sentinels)
     end
@@ -155,7 +160,7 @@ class RedisClient
 
     def resolve_master
       each_sentinel do |sentinel_client|
-        host, port = sentinel_client.call("SENTINEL", "get-master-addr-by-name", @name)
+        host, port = sentinel_client.call_v(["SENTINEL", "get-master-addr-by-name", @name])
         next unless host && port
 
         refresh_sentinels(sentinel_client)
@@ -174,7 +179,7 @@ class RedisClient
 
     def resolve_replica
       each_sentinel do |sentinel_client|
-        replicas = sentinel_client.call("SENTINEL", "replicas", @name, &@to_list_of_hash)
+        replicas = sentinel_client.call_v(["SENTINEL", "replicas", @name], &@to_list_of_hash)
         replicas.reject! do |r|
           flags = r["flags"].to_s.split(",")
           flags.include?("s_down") || flags.include?("o_down")
@@ -217,7 +222,7 @@ class RedisClient
     end
 
     def refresh_sentinels(sentinel_client)
-      sentinel_response = sentinel_client.call("SENTINEL", "sentinels", @name, &@to_list_of_hash)
+      sentinel_response = sentinel_client.call_v(["SENTINEL", "sentinels", @name], &@to_list_of_hash)
       sentinels = sentinel_response.map do |sentinel|
         { host: sentinel.fetch("ip"), port: Integer(sentinel.fetch("port")) }
       end

data/lib/redis_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RedisClient
-  VERSION = "0.26.3"
+  VERSION = "0.26.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-client
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.4
 platform: ruby
 authors:
 - Jean Boussier