Add lock timeout for redis storage

alisaifee · Jun 7, 2015 · b6b755d · b6b755d
1 parent 4ea9729
commit b6b755d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/limits/storage.py b/limits/storage.py
@@ -276,7 +276,7 @@ def acquire_entry(self, key, limit, expiry, no_add=False):
         :return: True/False
         """
         timestamp = time.time()
-        with self.lock_impl("%s/LOCK" % key):
+        with self.lock_impl("%s/LOCK" % key, blocking_timeout=1):
             entry = self.storage.lindex(key, limit - 1)
             if entry and float(entry) >= timestamp - expiry:
                 return False

diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -6,7 +6,7 @@
 
 import hiro
 import redis
-
+import redis.lock
 from limits.strategies import FixedWindowRateLimiter, MovingWindowRateLimiter
 from limits.errors import ConfigurationError
 from limits.limits import RateLimitItemPerMinute, RateLimitItemPerSecond
@@ -153,3 +153,11 @@ def smack(e):
         [k.set() for k in events]
         time.sleep(2)
         self.assertTrue(storage.storage.keys("%s/*" % limit.namespace) == [])
+
+    def test_failed_redis_lock(self):
+        storage = RedisStorage("redis://localhost:6379")
+        limiter = MovingWindowRateLimiter(storage)
+        limit = RateLimitItemPerSecond(1000)
+        key = limit.key_for("test") + "/LOCK"
+        storage.storage.setnx(key, 1)
+        self.assertRaises(redis.lock.LockError, limiter.hit, limit, "test")