Merge remote branch 'aezell/requeue_jobs'

Author: Matt George

pyres/failure/__init__.py

@@ -20,5 +20,13 @@ def clear(resq):
 def requeue(resq, failure_object):
     queue = failure_object._queue
     payload = failure_object._payload
-    return resq.push(queue,payload)
+    return resq.push(queue, payload)
+    
+def retry(resq, queue, payload):
+    job = resq.decode(payload)
+    resq.push(queue, job['payload'])
+    return delete(resq, payload)
+    
+def delete(resq, payload):
+    return resq.redis.lrem(name = 'resque:failed', num = 1, value = payload)
 

pyres/failure/redis.py

@@ -24,11 +24,18 @@ def save(self, resq=None):
     @classmethod
     def count(cls, resq):
         return int(resq.redis.llen('resque:failed'))
-    
+
     @classmethod
     def all(cls, resq, start=0, count=1):
-        return resq.list_range('resque:failed', start, count)
-        
+        from base64 import b64encode
+        items = resq.redis.lrange('resque:failed', start, count) or []
+        ret_list = []
+        for i in items:
+            failure = ResQ.decode(i)
+            failure['redis_value'] = b64encode(i)
+            ret_list.append(failure)
+        return ret_list
+
     @classmethod
     def clear(cls, resq):
         return resq.redis.delete('resque:failed')

resweb/server.py

@@ -42,6 +42,33 @@ def failed(request):
     start = request.GET.get('start',0)
     start = int(start)
     return str(Failed(HOST, start).render())
+    
+@post('/failed/retry/')
+def failed_retry(request):
+    from base64 import b64decode
+    from pyres import failure
+    try:
+        import json
+    except ImportError:
+        import simplejson as json
+    failed_job = request.POST['failed_job']
+    job = b64decode(failed_job)
+    decoded = ResQ.decode(job)
+    failure.retry(HOST, decoded['queue'], job)
+    raise Redirect('/failed/')
+    
+@post('/failed/delete/')
+def failed_delete(request):
+    from base64 import b64decode
+    from pyres import failure
+    try:
+        import json
+    except ImportError:
+        import simplejson as json
+    failed_job = request.POST['failed_job']
+    job = b64decode(failed_job)
+    failure.delete(HOST, job)
+    raise Redirect('/failed/')
 
 @get('/workers/(?P<worker_id>\w.+)/')
 def worker(request, worker_id):
@@ -77,7 +104,6 @@ def delayed_timestamp(request, timestamp):
 
 @get('/media/(?P<filename>.+)')
 def my_media(request, filename):
-    print filename
     #return serve_static_file(request, filename)
     #my_media.content_type = content_type(filename)
 

resweb/templates/failed.mustache

@@ -34,6 +34,19 @@ $(document).ready(function(){
           <a href="#" class="backtrace">{{error}}</a>
           <pre style='display:none'>{{traceback}}</pre>          
         </dd>
+		<dt>
+		  Payload Actions
+		</dt>
+		<dd>
+			<form action="/failed/retry/" method="post" accept-charset="utf-8">
+				<p><input type="hidden" name="failed_job" value="{{redis_value}}" id="failed_job" />
+				<p><input type="submit" value="Requeue" /></p>
+			</form>
+			<form action="/failed/delete/" method="post" accept-charset="utf-8">
+				<p><input type="hidden" name="failed_job" value="{{redis_value}}" id="failed_job" />
+				<p><input type="submit" value="Delete" /></p>
+			</form>
+		</dd>
       </dl>
       <div class='r'>
       </div>

resweb/views.py

@@ -202,6 +202,7 @@ def link_func(self, start):
 class Failed(ResWeb):
     def __init__(self, host, start=0):
         self._start = start
+        self.host = host
         super(Failed, self).__init__(host)
 
     def start(self):
@@ -214,10 +215,15 @@ def size(self):
         return str(failure.count(self.resq) or 0)
 
     def failed_jobs(self):
+        from base64 import b64encode
+        try:
+            import json
+        except ImportError:
+            import simplejson as json
         jobs = []
         for job in failure.all(self.resq, self._start, self._start + 20):
             item = job
-            item['failed_at'] = str(datetime.datetime.fromtimestamp(float(item['failed_at'])))
+            item['failed_at'] = str(datetime.datetime.fromtimestamp(float(job['failed_at'])))
             item['worker_url'] = '/workers/%s/' % job['worker']
             item['payload_args'] = str(job['payload']['args'])
             item['payload_class'] = job['payload']['class']
@@ -230,6 +236,7 @@ def pagination(self):
 
     def link_func(self, start):
         return '/failed/?start=%s' % start
+        
 class Stats(ResWeb):
     def __init__(self, host, key_id):
         self.key_id = key_id