Prechádzať zdrojové kódy

Use redis.StrictRedis

Ask Solem 9 rokov pred
rodič
commit
89fa04c0e5

+ 2 - 2
celery/backends/redis.py

@@ -149,7 +149,7 @@ class RedisBackend(KeyValueStoreBackend):
     def _set(self, key, value):
     def _set(self, key, value):
         with self.client.pipeline() as pipe:
         with self.client.pipeline() as pipe:
             if self.expires:
             if self.expires:
-                pipe.setex(key, value, self.expires)
+                pipe.setex(key, self.expires, value)
             else:
             else:
                 pipe.set(key, value)
                 pipe.set(key, value)
             pipe.publish(key, value)
             pipe.publish(key, value)
@@ -237,7 +237,7 @@ class RedisBackend(KeyValueStoreBackend):
 
 
     def _create_client(self, socket_timeout=None, socket_connect_timeout=None,
     def _create_client(self, socket_timeout=None, socket_connect_timeout=None,
                        **params):
                        **params):
-        return self.redis.Redis(
+        return self.redis.StrictRedis(
             connection_pool=self.ConnectionPool(
             connection_pool=self.ConnectionPool(
                 socket_timeout=socket_timeout and float(socket_timeout),
                 socket_timeout=socket_timeout and float(socket_timeout),
                 socket_connect_timeout=socket_connect_timeout and float(
                 socket_connect_timeout=socket_connect_timeout and float(

+ 2 - 2
celery/tests/backends/test_redis.py

@@ -63,7 +63,7 @@ class Redis(MockCallbacks):
     def get(self, key):
     def get(self, key):
         return self.keyspace.get(key)
         return self.keyspace.get(key)
 
 
-    def setex(self, key, value, expires):
+    def setex(self, key, expires, value):
         self.set(key, value)
         self.set(key, value)
         self.expire(key, expires)
         self.expire(key, expires)
 
 
@@ -98,7 +98,7 @@ class Redis(MockCallbacks):
 
 
 
 
 class redis(object):
 class redis(object):
-    Redis = Redis
+    StrictRedis = Redis
 
 
     class ConnectionPool(object):
     class ConnectionPool(object):