Merge remote branch 'chawco/feature/pyres-web-fixes' into chawco_merge

Conflicts:
	pyres/failure/redis.py
	pyres/worker.py
	resweb/views.py

Author: binarymatt

pyres/failure/base.py

@@ -4,33 +4,36 @@
 class BaseBackend(object):
     """Provides a base class that custom backends can subclass. Also provides basic
     traceback and message parsing.
-    
+
     The ``__init__`` takes these keyword arguments:
-    
+
         ``exp`` -- The exception generated by your failure.
-        
+
         ``queue`` -- The queue in which the ``Job`` was enqueued when it failed.
-        
+
         ``payload`` -- The payload that was passed to the ``Job``.
-        
+
         ``worker`` -- The worker that was processing the ``Job`` when it failed.
-    
+
     """
     def __init__(self, exp, queue, payload, worker=None):
         excc, _, tb = sys.exc_info()
-        
+
         self._exception = excc
         self._traceback = traceback.format_exc()
         self._worker = worker
         self._queue = queue
         self._payload = payload
-    
-    
+
+
     def _parse_traceback(self, trace):
         """Return the given traceback string formatted for a notification."""
-        return trace
-    
+        if not trace:
+            return []
+
+        return trace.split('\n')
+
     def _parse_message(self, exc):
         """Return a message for a notification from the given exception."""
         return '%s: %s' % (exc.__class__.__name__, str(exc))
-    
+

pyres/failure/redis.py

@@ -12,8 +12,9 @@ def save(self, resq=None):
         if not resq:
             resq = ResQ()
         data = {
-            'failed_at' : int(time.mktime(datetime.datetime.now().timetuple())),
+            'failed_at' : datetime.datetime.now().strftime('%Y/%m/%d %H:%M:%S'),
             'payload'   : self._payload,
+            'exception' : self._exception.__class__.__name__,
             'error'     : self._parse_message(self._exception),
             'backtrace' : self._parse_traceback(self._traceback),
             'queue'     : self._queue

pyres/worker.py

@@ -112,18 +112,16 @@ def __str__(self):
         return '%s:%s:%s' % (self.hostname, self.pid, ','.join(self.queues))
 
     def work(self, interval=5):
-        """Invoked by ``run`` method. ``work`` listens on a list of queues and
-        sleeps for ``interval`` time.
+        """Invoked by ``run`` method. ``work`` listens on a list of queues and sleeps
+        for ``interval`` time.
 
-        ``interval`` -- Number of seconds the worker will wait until processing
-        the next job. Default is "5".
+        ``interval`` -- Number of seconds the worker will wait until processing the next job. Default is "5".
 
         Whenever a worker finds a job on the queue it first calls ``reserve`` on
-        that job to make sure another worker won't run it, then *forks* itself
-        to work on that job.
+        that job to make sure another worker won't run it, then *forks* itself to
+        work on that job.
 
-        Finally, the ``process`` method actually processes the job by eventually
-        calling the Job instance's ``perform`` method.
+        Finally, the ``process`` method actually processes the job by eventually calling the Job instance's ``perform`` method.
 
         """
         setproctitle('pyres_worker-%s: Starting' % __version__)
@@ -224,7 +222,7 @@ def working_on(self, job):
         logger.debug('marking as working on')
         data = {
             'queue': job._queue,
-            'run_at': int(time.mktime(datetime.datetime.now().timetuple())),
+            'run_at': str(int(time.mktime(datetime.datetime.now().timetuple()))),
             'payload': job._payload
         }
         data = json.dumps(data)
@@ -290,8 +288,7 @@ def all(cls, host="localhost:6379"):
         elif isinstance(host, ResQ):
             resq = host
 
-        return [Worker.find(w,resq)
-                for w in resq.redis.smembers('resque:workers') or []]
+        return [Worker.find(w,resq) for w in resq.redis.smembers('resque:workers') or []]
 
     @classmethod
     def working(cls, host):

resweb/templates/failed.mustache

@@ -41,10 +41,12 @@ function delete_all(){
         <dd><code>{{payload_class}}</code></dd>
         <dt>Arguments</dt>
         <dd><pre>{{payload_args}}</pre></dd>
+        <dt>Exception</dt>
+        <dd><pre>{{exception}}</pre></dd>
         <dt>Error</dt>
         <dd>
           <a href="#" class="backtrace">{{error}}</a>
-          <pre style='display:none'>{{traceback}}</pre>          
+          <pre style='display:none'>{{traceback}}</pre>
         </dd>
 		<dt>
 		  Payload Actions

resweb/views.py

@@ -55,7 +55,7 @@ def queue(self):
 
     def queues(self):
         queues = []
-        for q in self.resq.queues():
+        for q in sorted(self.resq.queues()):
             queues.append({
                 'queue': q,
                 'size': str(self.resq.size(q)),
@@ -217,12 +217,17 @@ def size(self):
     def failed_jobs(self):
         jobs = []
         for job in failure.all(self.resq, self._start, self._start + 20):
+            backtrace = job['backtrace']
+
+            if isinstance(backtrace, list):
+                backtrace = '\n'.join(backtrace)
+
             item = job
-            item['failed_at'] = str(datetime.datetime.fromtimestamp(float(job['failed_at'])))
+            item['failed_at'] = job['failed_at']
             item['worker_url'] = '/workers/%s/' % job['worker']
             item['payload_args'] = str(job['payload']['args'])[:1024]
             item['payload_class'] = job['payload']['class']
-            item['traceback'] = job['backtrace']
+            item['traceback'] = backtrace
             jobs.append(item)
 
         return jobs