Merge branch 'upstream-merge' of git://github.com/c-oreills/pyres into c-oreills-upstream-merge

Conflicts:
	pyres/__init__.py

Author: Matt George

pyres/__init__.py

@@ -212,19 +212,12 @@ def enqueue(self, klass, *args):
         queue = getattr(klass,'queue', None)
         if queue:
             class_name = '%s.%s' % (klass.__module__, klass.__name__)
-            self.push(queue, {'class':class_name,'args':args,
-                              'enqueue_timestamp':time.time()})
-            logging.info("enqueued '%s' job on queue %s" % (class_name, queue))
-            if args:
-                logging.debug("job arguments: %s" % str(args))
-            else:
-                logging.debug("no arguments passed in.")
+            self.enqueue_from_string(class_name, queue, *args)
         else:
             logging.warning("unable to enqueue job with class %s" % str(klass))
 
     def enqueue_from_string(self, klass_as_string, queue, *args, **kwargs):
-        payload = {'class':klass_as_string, 'queue': queue, 'args':args,
-                   'enqueue_timestamp':time.time()}
+        payload = {'class':klass_as_string, 'args':args, 'enqueue_timestamp': time.time()}
         if 'first_attempt' in kwargs:
             payload['first_attempt'] = kwargs['first_attempt']
         self.push(queue, payload)
@@ -288,11 +281,14 @@ def close(self):
 
     def enqueue_at(self, datetime, klass, *args, **kwargs):
         class_name = '%s.%s' % (klass.__module__, klass.__name__)
+        self.enqueue_at_from_string(datetime, class_name, klass.queue, *args, **kwargs)
+
+    def enqueue_at_from_string(self, datetime, klass_as_string, queue, *args, **kwargs):
         logging.info("scheduled '%s' job on queue %s for execution at %s" %
-                     (class_name, klass.queue, datetime))
+                     (klass_as_string, queue, datetime))
         if args:
             logging.debug("job arguments are: %s" % str(args))
-        payload = {'class':class_name, 'queue': klass.queue, 'args':args}
+        payload = {'class': klass_as_string, 'queue': queue, 'args': args}
         if 'first_attempt' in kwargs:
             payload['first_attempt'] = kwargs['first_attempt']
         self.delayed_push(datetime, payload)

pyres/worker.py

@@ -275,7 +275,7 @@ def reserve(self, timeout=10):
         logger.debug('checking queues %s' % self.queues)
         job = self.job_class.reserve(self.queues, self.resq, self.__str__(), timeout=timeout)
         if job:
-            logger.info('Found job on %s' % job._queue)
+            logger.info('Found job on %s: %s' % (job._queue, job))
             return job
 
     def working_on(self, job):