redis-client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e24d8136cd8dc878d579c850297b1a016133447fd1f6135bd29dba55cd764e
-  data.tar.gz: 9f67aa59e1dfe2370f5f786ef3dea8076abe172301d263a13624b65cb2ab3888
+  metadata.gz: 43d0bd9c0a97bdf398a2eee688663b6aa18facfa54c03b77465872454c710dd6
+  data.tar.gz: 628f5bd32c2cf5f4dabc326152f47d9ee474a9db748a0778fd111b8b529f3e84
 SHA512:
-  metadata.gz: 2e18d178c2d520073189c71f643c7da18f46f7324c75c8757fc28a8673599064c1678186b4a6833beacf40068498cb5bf19dc6175040caedc8e9286b13e079c2
-  data.tar.gz: d682b304d13901199f71e3c77561eb6562d7dddeae37068e9a20c0e8383a7c12bfbd5c1b250a506990425f126884a5f8946ea7df335bf31ee89713df187b3490
+  metadata.gz: 8dd0782af2688e60628333605c57dcd54b97c38faf01f364e1599b85f34792139559e3a3f658e7b942d98438fa621725abbcad6101beec0d2a87076b34cbbd6c
+  data.tar.gz: d7be85daadf3495f856de253fbd5744f143f92b087489a91436460ae5ef86be3af02aa7cff00582a79bf17bfe7c28b328e08e116c47285d29ff35a9454c37762

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Unreleased
 
+# 0.7.0
+
+- Sentinel config now accept a list of URLs: `RedisClient.sentinel(sentinels: %w(redis://example.com:7000 redis://example.com:7001 ..))`
+
+# 0.6.2
+
+- Fix sentinel to not connected to s_down or o_down replicas.
+
+# 0.6.1
+
+- Fix `REDIS_REPLY_SET` parsing in `hiredis`.
+
 # 0.6.0
 
 - Added `protocol: 2` options to talk with Redis 5 and older servers.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-client (0.6.0)
+    redis-client (0.7.0)
       connection_pool
 
 GEM

data/README.md

@@ -100,6 +100,19 @@ redis_config = RedisClient.sentinel(
 )
 ```
 
+or:
+
+```ruby
+redis_config = RedisClient.sentinel(
+  name: "mymaster",
+  sentinels: [
+    "redis://127.0.0.1:26380",
+    "redis://127.0.0.1:26381",
+  ],
+  role: :master,
+)
+```
+
 * The name identifies a group of Redis instances composed of a master and one or more replicas (`mymaster` in the example).
 
 * It is possible to optionally provide a role. The allowed roles are `:master`

data/lib/redis_client/sentinel_config.rb

@@ -26,7 +26,14 @@ class RedisClient
       end
 
       @name = name
-      @sentinel_configs = sentinels.map { |s| Config.new(**extra_config, **s) }
+      @sentinel_configs = sentinels.map do |s|
+        case s
+        when String
+          Config.new(**extra_config, url: s)
+        else
+          Config.new(**extra_config, **s)
+        end
+      end
       @sentinels = {}.compare_by_identity
       @role = role
       @mutex = Mutex.new
@@ -116,10 +123,13 @@ class RedisClient
     def resolve_replica
       each_sentinel do |sentinel_client|
         replicas = sentinel_client.call("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")
+        end
         next if replicas.empty?
 
-        replica = replicas.reject { |r| r["flags"].to_s.split(",").include?("disconnected") }.sample
-        replica ||= replicas.sample
+        replica = replicas.sample
         return Config.new(host: replica["ip"], port: Integer(replica["port"]), **@client_config)
       end
     rescue ConnectionError

data/lib/redis_client/version.rb

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

data/lib/redis_client.rb

@@ -600,7 +600,7 @@ class RedisClient
         else
           connection
         end
-      rescue ConnectionError => error
+      rescue ConnectionError, ProtocolError => error
         connection&.close
         close
 
@@ -617,7 +617,7 @@ class RedisClient
       begin
         @disable_reconnection = true
         yield connection
-      rescue ConnectionError
+      rescue ConnectionError, ProtocolError
         connection&.close
         close
         raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool