redis-cluster-client 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eab80ca6b1a69e3c45bc0dd59f9dd05189559907e0976a534ddc5dc0de26527b
-  data.tar.gz: 90aa485da1918f0a46f36964ff7ede3c775dcf90ebf0477df0a6d5f2cc3846f7
+  metadata.gz: a8db8a7aac1f09df0c2fc3c7da3f0227246671d2fd0a199dabcda22caa0787d3
+  data.tar.gz: d0431f663859765f0ff3f537f4f74fcd17a72c561b615616ae5e24543bb3d3df
 SHA512:
-  metadata.gz: 101ec6c98f8f2164b4c8da1a497ca31ca456d7c567ac9c96e8ac3220b37be96160ad558111c19e92d67c1947c29523463011c073016158a2930c7462231f3bc8
-  data.tar.gz: 72067a86f5fb1839bab4766dad20e5157932238c1a6237c9de805cf7dbd77e784b5b1b47e560f3585550521b36632dd7e9a094ccecad0e4ee893eb27bfc1f342
+  metadata.gz: bed8b8bc6f6321808fcee27b30c43746eca124abad25bbdb7923bc6b6faf56cb53343008fcf4648d4be56df42d7e8baa1a105206ff6a7370dae9c528bf7213cc
+  data.tar.gz: 1ee8f2edc8207011ccdda3a3d863895adc5ae0f3747b4b62374a96cbb19779f00b13fb350aa519a38083708da250f0e3249667c0a8dbaaeaf07781f2dcf0cbdd

data/lib/redis_client/cluster/pub_sub.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'redis_client'
+
 class RedisClient
   class Cluster
     class PubSub
@@ -20,7 +22,7 @@ class RedisClient
 
         def take_message(timeout)
           @worker = subscribe(@client, timeout) if @worker.nil?
-          return if @worker.join(0.01).nil?
+          return if @worker.alive?
 
           message = @worker[:reply]
           @worker = nil
@@ -76,8 +78,26 @@ class RedisClient
 
       def _call(command)
         node_key = @router.find_node_key(command)
-        @states[node_key] = State.new(@router.find_node(node_key).pubsub) unless @states.key?(node_key)
+        add_state(node_key)
+        try_call(node_key, command)
+      end
+
+      def try_call(node_key, command, retry_count: 1)
         @states[node_key].call(command)
+      rescue ::RedisClient::CommandError => e
+        raise if !e.message.start_with?('MOVED') || retry_count <= 0
+
+        # for sharded pub/sub
+        node_key = e.message.split[2]
+        add_state(node_key)
+        retry_count -= 1
+        retry
+      end
+
+      def add_state(node_key)
+        return @states[node_key] if @states.key?(node_key)
+
+        @states[node_key] = State.new(@router.find_node(node_key).pubsub)
       end
 
       def obtain_current_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client