If a Redis lock is deleted between SETNX and GET, do nothing since it…

…'s probably caused by another process having just finished doing GC.
relrod · Sep 22, 2011 · 92fc39d · 92fc39d
1 parent a66ff17
commit 92fc39d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/javascript/engines/redis.js b/javascript/engines/redis.js
@@ -176,7 +176,7 @@ Faye.Engine.Redis = Faye.Class(Faye.Engine.Base, {
       if (set === 1) return callback.call(scope, releaseLock);
 
       self._redis.get(lockKey, function(error, timeout) {
-        if (!timeout) return self._withLock(lockKey, callback, scope);
+        if (!timeout) return;
 
         var lockTimeout = parseInt(timeout, 10);
         if (currentTime < lockTimeout) return;

diff --git a/lib/faye/engines/redis.rb b/lib/faye/engines/redis.rb
@@ -192,8 +192,6 @@ def with_lock(lock_name, &block)
                     block.call(release_lock) if old_value == timeout
                   end
                 end
-              else
-                with_lock(lock_name, &block)
               end
             end