Use blocking pop correctly.

Author: chawco

pyres/__init__.py

@@ -105,8 +105,8 @@ def push(self, queue, item):
         self.watch_queue(queue)
         self.redis.rpush("resque:queue:%s" % queue, ResQ.encode(item))
 
-    def pop(self, queue):
-        ret = self.redis.lpop("resque:queue:%s" % queue)
+    def pop(self, queue, timeout=10):
+        ret = self.redis.blpop("resque:queue:%s" % queue, timeout=timeout)
         if ret:
             return ResQ.decode(ret)
         return ret

pyres/job.py

@@ -77,11 +77,11 @@ def retry(self, payload_class, args):
         return False
 
     @classmethod
-    def reserve(cls, queue, res, worker=None):
+    def reserve(cls, queue, res, worker=None, timeout=10):
         """Reserve a job on the queue. This marks this job so that other workers
         will not pick it up.
 
         """
-        payload = res.blpop(queue, timeout=10)
+        payload = res.pop(queue, timeout=timeout)
         if payload:
             return cls(queue, payload, res, worker)

pyres/worker.py

@@ -193,10 +193,10 @@ def process(self, job=None):
         finally:
             self.done_working()
 
-    def reserve(self):
+    def reserve(self, timeout=10):
         for q in self.queues:
             logger.debug('checking queue %s' % q)
-            job = Job.reserve(q, self.resq, self.__str__())
+            job = Job.reserve(q, self.resq, self.__str__(), timeout=timeout)
             if job:
                 logger.info('Found job on %s' % q)
                 return job