From 90a458ca8e33459365db808abc4d1e7da44e7162 Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@3rdcloud.com>
Date: Fri, 10 Feb 2012 18:33:11 +0100
Subject: [PATCH] Add more colorful terminal output.

For better visual parsability.
---
 rq/worker.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/rq/worker.py b/rq/worker.py
index f52c659d..a6bbd512 100644
--- a/rq/worker.py
+++ b/rq/worker.py
@@ -20,6 +20,8 @@ from .utils import make_colorizer
 from .exceptions import NoQueueError, UnpickleError
 
 green = make_colorizer('darkgreen')
+yellow = make_colorizer('darkyellow')
+blue = make_colorizer('darkblue')
 
 def iterable(x):
     return hasattr(x, '__iter__')
@@ -254,14 +256,13 @@ class Worker(object):
                 self.state = 'idle'
                 qnames = self.queue_names()
                 self.procline('Listening on %s' % ','.join(qnames))
-                self.log.info('*** Listening for work on %s...' % (', '.join(qnames)))
+                self.log.info('')
+                self.log.info('*** Listening on %s...' % (green(', '.join(qnames))))
                 wait_for_job = not burst
                 try:
                     result = Queue.dequeue_any(self.queues, wait_for_job)
                     if result is None:
                         break
-                    job, queue = result
-                    self.log.info('%s: %s' % (green(queue.name), job))
                 except UnpickleError as e:
                     self.log.warning('*** Ignoring unpickleable data on %s.' % (e.queue.name,))
                     self.log.debug('Data follows:')
@@ -270,6 +271,9 @@ class Worker(object):
                     self.failure_queue.push_job_id(e.job_id)
                     continue
 
+                job, queue = result
+                self.log.info('%s: %s (%s)' % (green(queue.name), blue(job.description), job.id))
+
                 self.state = 'busy'
                 self.fork_and_perform_job(job)
 
@@ -309,10 +313,6 @@ class Worker(object):
         self.procline('Processing %s from %s since %s' % (
             job.func.__name__,
             job.origin, time.time()))
-        msg = 'Got job %s from %s' % (
-                job.description,
-                job.origin)
-        self.log.info(msg)
         try:
             rv = job.perform()
         except Exception as e:
@@ -333,7 +333,10 @@ class Worker(object):
 
             return False
         else:
-            self.log.info('Job OK, result = %s' % (rv,))
+            if rv is None:
+                self.log.info('Job OK')
+            else:
+                self.log.info('Job OK, result = %s' % (yellow(rv),))
         if rv is not None:
             p = conn.pipeline()
             p.set(job.result, dumps(rv))