redis-cluster-client 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cd5b517f21a96b53fcaa47eb44e28b0c8d12aef23e3d2d239b2568d5ba61cd
-  data.tar.gz: ec4a1ebf3e548fdd7bfb184a910511f98919eecda1987674bef8d135bfc8b9da
+  metadata.gz: 75b13bfebd7ddbbb49d37626af8bae2b0a0c21ddc7ad198856c60c502700909e
+  data.tar.gz: 9f8deb6e34399711ba7e432a85747272c51aa5525e3efc8d637577baab831e9e
 SHA512:
-  metadata.gz: 92a61bcbb6964cb41ed791768d346f65b48d1943627fbea13b86cf995e921990dcc41651553f7c5200e60cebc7c5cc7e519795e02a9173e37dd1ef4da1201006
-  data.tar.gz: a27605d3438d40da8be910776db98fd6ede734c9ac8824c3bcedfc599d0d1f3f6f00187a7e785f96d0da8d1f480b0c6f012fa4670e31edf1c152f189a59bcf73
+  metadata.gz: 764b1ff360c46af8afebe9d937a2ac2ba3442701a4b5e9626af6157557bb29f9e35f0d0dcaff473cc77aa47b9930c6e179e42ceffa501d2105ab478e2d4f6fc8
+  data.tar.gz: 2eec106a7a6d0e38253ffca1f115d2a5368f3dd3c5bcfaafe25bb51bba35be67ba765dd5f6d93916d3eb23193bf4e588fe33833df8602475b58867ef8801585f

data/lib/redis_client/cluster/pub_sub.rb

@@ -9,6 +9,7 @@ class RedisClient
         @router = router
         @command_builder = command_builder
         @pubsub_states = {}
+        @messages = []
       end
 
       def call(*args, **kwargs)
@@ -22,13 +23,15 @@ class RedisClient
       def close
         @pubsub_states.each_value(&:close)
         @pubsub_states.clear
+        @messages.clear
       end
 
       def next_event(timeout = nil)
-        msgs = collect_messages(timeout).compact
-        return msgs.first if msgs.size == 1
+        return if @pubsub_states.empty?
+        return @messages.shift unless @messages.empty?
 
-        msgs
+        collect_messages(timeout)
+        @messages.shift
       end
 
       private
@@ -44,7 +47,7 @@ class RedisClient
       end
 
       def collect_messages(timeout)
-        @pubsub_states.each_slice(MAX_THREADS).each_with_object([]) do |chuncked_pubsub_states, acc|
+        @pubsub_states.each_slice(MAX_THREADS) do |chuncked_pubsub_states|
           threads = chuncked_pubsub_states.map do |_, v|
             Thread.new(v) do |pubsub|
               Thread.current[:reply] = pubsub.next_event(timeout)
@@ -55,7 +58,7 @@ class RedisClient
 
           threads.each do |t|
             t.join
-            acc << t[:reply]
+            @messages << t[:reply] unless t[:reply].nil?
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Taishi Kasuga