redis-client 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b26d6232b408310d32fda820a8d89263dccd3d3af1ab9518f2f398fdcb94c5
-  data.tar.gz: af204813327a82cf9a80dd22ee7b5528f67df200765561bcb0e399bdd5b0e829
+  metadata.gz: a4170ea87f36925fbfdd698282bfaacc9d922c5cdb2a3474944cbf1ad10f86a4
+  data.tar.gz: 46add9543d181621ebb5c54594318d4111c00c8153083b3c84c9363693eceb95
 SHA512:
-  metadata.gz: 3754bcdfb70484753fb67e69cbc0b071eb7dacbef67a48edb59dd55a8c79094a84b3ca96caa7f0f8ac0969ce24433688d81eba2bca3b27be79bb60600a1ff1a8
-  data.tar.gz: 998dd6e7b0cf8d92880b473aee858f19e3bff1da2ce670f4c4fae3e43e2f534a8cf2cdd1aca064036bc7c20cea660ad69d3611d80c15f5679ca78bef1747e637
+  metadata.gz: ae48b57736db4a41686f2e9462b85c193ebe75bf323d2684c89ae5905aa4000cd69c806fd1ee9d63a117ad6e35a6d4befd28779938726e2ab4932273e32dbe46
+  data.tar.gz: d17c48e6252575b6842bff27dee3a608f066a9646684d675a2bd9bfd8285c308797c8359137b213f6d736377324e6d10b5f4e3fd306e605d891b14cef93f906f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Unreleased
 
+# 0.7.1
+
+- Fix `#pubsub` being called when reconnection is disabled (redis-rb compatibility fix).
+
+# 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`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-client (0.6.1)
+    redis-client (0.7.1)
       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.1"
+  VERSION = "0.7.1"
 end

data/lib/redis_client.rb

@@ -589,7 +589,11 @@ class RedisClient
 
   def ensure_connected(retryable: true)
     if @disable_reconnection
-      yield @raw_connection
+      if block_given?
+        yield @raw_connection
+      else
+        @raw_connection
+      end
     elsif retryable
       tries = 0
       connection = nil

metadata

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