Prevent hang if multiple threads attempt to use an unconnected client

redis · Jul 22, 2010 · 03cee15 · 03cee15
1 parent 8a84d72
commit 03cee15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/redis/client.rb b/lib/redis/client.rb
@@ -266,9 +266,7 @@ def synchronize(&block)
       end
 
       def ensure_connected(&block)
-        super do
-          synchronize(&block)
-        end
+        synchronize { super }
       end
     end
 

diff --git a/test/redis_test.rb b/test/redis_test.rb
@@ -1526,6 +1526,7 @@ class RedisTest < Test::Unit::TestCase
   context "Thread safety" do
     should "be thread safe" do
       @r = prepare Redis.new(OPTIONS.merge(:thread_safe => true))
+      @r.client.disconnect
 
       r1, r2 = nil