upgraded pyres to use the 1.34.1 version of

redis-py

This allows us to support higher versions of redis
which means we can start start using commands such
as blocking pops.

Author: Matt George

pyres/__init__.py

@@ -3,8 +3,6 @@
 from redis import Redis
 import pyres.json_parser as json
 
-import types
-
 def my_import(name):
     mod = __import__(name)    
     components = name.split('.')    
@@ -60,18 +58,18 @@ class ResQ(object):
     def __init__(self, server="localhost:6379", password=None, 
                  timeout=None, retry_connection=True):
         self.timeout = timeout
-        self.retry_connection = retry_connection
+        #self.retry_connection = retry_connection
         self.redis = server
         if password:
             self.redis.auth(password)
         self._watched_queues = set()
 
     def push(self, queue, item):
         self.watch_queue(queue)
-        self.redis.push("resque:queue:%s" % queue, ResQ.encode(item))
+        self.redis.rpush("resque:queue:%s" % queue, ResQ.encode(item))
 
     def pop(self, queue):
-        ret = self.redis.pop("resque:queue:%s" % queue)
+        ret = self.redis.lpop("resque:queue:%s" % queue)
         if ret:
             return ResQ.decode(ret)
         return ret
@@ -103,9 +101,7 @@ def _set_redis(self, server):
         if isinstance(server, basestring):
             self.dsn = server
             host, port = server.split(':')
-            self._redis = Redis(host=host, port=int(port), 
-                                retry_connection=self.retry_connection,
-                                timeout=self.timeout)
+            self._redis = Redis(host=host, port=int(port))
         elif isinstance(server, Redis):
             self.dsn = '%s:%s' % (server.host,server.port)
             self._redis = server

pyres/failure/redis.py

@@ -15,7 +15,7 @@ def save(self, resq=None):
         if self._worker:
             data['worker'] = self._worker
         data = ResQ.encode(data)
-        resq.redis.push('resque:failed', data)
+        resq.redis.rpush('resque:failed', data)
 
     @classmethod
     def count(cls, resq):

pyres/worker.py

@@ -212,7 +212,8 @@ def all(cls, host="localhost:6379"):
             resq = ResQ(host)
         elif isinstance(host, ResQ):
             resq = host
-        return [Worker.find(w,resq) for w in resq.redis.smembers('resque:workers')]
+        
+        return [Worker.find(w,resq) for w in resq.redis.smembers('resque:workers') or []]
 
     @classmethod
     def working(cls, host):

requirements.txt

@@ -1,4 +1,4 @@
 simplejson==2.0.9
 itty==0.6.2
-redis==0.6.0
+redis==1.34.1
 pystache==0.1.0

tests/__init__.py

@@ -51,9 +51,9 @@ class PyResTests(unittest.TestCase):
     def setUp(self):
         self.resq = ResQ()
         self.redis = self.resq.redis
-        self.redis.flush(True)
+        self.redis.flushall()
 
     def tearDown(self):
-        self.redis.flush(True)
+        self.redis.flushall()
         del self.redis
         del self.resq

tests/test_stats.py

@@ -4,22 +4,22 @@ class StatTests(PyResTests):
     def test_incr(self):
         stat_obj = Stat('test_stat', self.resq)
         stat_obj.incr()
-        assert self.redis.get('resque:stat:test_stat') == 1
+        assert self.redis.get('resque:stat:test_stat') == str(1)
         stat_obj.incr()
-        assert self.redis.get('resque:stat:test_stat') == 2
+        assert self.redis.get('resque:stat:test_stat') == str(2)
         stat_obj.incr(2)
-        assert self.redis.get('resque:stat:test_stat') == 4
+        assert self.redis.get('resque:stat:test_stat') == str(4)
 
     def test_decr(self):
         stat_obj = Stat('test_stat', self.resq)
         stat_obj.incr()
         stat_obj.incr()
-        assert self.redis.get('resque:stat:test_stat') == 2
+        assert self.redis.get('resque:stat:test_stat') == str(2)
         stat_obj.decr()
-        assert self.redis.get('resque:stat:test_stat') == 1
+        assert self.redis.get('resque:stat:test_stat') == str(1)
         stat_obj.incr()
         stat_obj.decr(2)
-        assert self.redis.get('resque:stat:test_stat') == 0
+        assert self.redis.get('resque:stat:test_stat') == str(0)
 
     def test_get(self):
         stat_obj = Stat('test_stat', self.resq)

tests/test_worker.py

@@ -48,23 +48,23 @@ def test_processed(self):
         worker.processed()
         assert self.redis.exists("resque:stat:processed")
         assert self.redis.exists("resque:stat:processed:%s" % name)
-        assert self.redis.get("resque:stat:processed") == 1
-        assert self.redis.get("resque:stat:processed:%s" % name) == 1
+        assert self.redis.get("resque:stat:processed") == str(1)
+        assert self.redis.get("resque:stat:processed:%s" % name) == str(1)
         worker.processed()
-        assert self.redis.get("resque:stat:processed") == 2
-        assert self.redis.get("resque:stat:processed:%s" % name) == 2
+        assert self.redis.get("resque:stat:processed") == str(2)
+        assert self.redis.get("resque:stat:processed:%s" % name) == str(2)
 
     def test_failed(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         worker = Worker(['basic'])
         worker.failed()
         assert self.redis.exists("resque:stat:failed")
         assert self.redis.exists("resque:stat:failed:%s" % name)
-        assert self.redis.get("resque:stat:failed") == 1
-        assert self.redis.get("resque:stat:failed:%s" % name) == 1
+        assert self.redis.get("resque:stat:failed") == str(1)
+        assert self.redis.get("resque:stat:failed:%s" % name) == str(1)
         worker.failed()
-        assert self.redis.get("resque:stat:failed") == 2
-        assert self.redis.get("resque:stat:failed:%s" % name) == 2
+        assert self.redis.get("resque:stat:failed") == str(2)
+        assert self.redis.get("resque:stat:failed:%s" % name) == str(2)
 
     def test_process(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
@@ -102,8 +102,8 @@ def test_job_failure(self):
         worker.process()
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         assert not self.redis.get('resque:worker:%s' % worker)
-        assert self.redis.get("resque:stat:failed") == 1
-        assert self.redis.get("resque:stat:failed:%s" % name) == 1
+        assert self.redis.get("resque:stat:failed") == str(1)
+        assert self.redis.get("resque:stat:failed:%s" % name) == str(1)
 
     def test_get_job(self):
         worker = Worker(['basic'])