added some updates for the web interface

Author: Matt George

src/pyres/__init__.py

@@ -19,6 +19,7 @@ def str_to_class(s):
 class ResQ(object):
     _res = None
     def __init__(self, server="localhost:6379"):
+        self._server = server
         host, port = server.split(':')
         self._redis = Redis(host=host, port=int(port))
         self._watched_queues = {}
@@ -57,8 +58,10 @@ def encode(cls, item):
 
     @classmethod
     def decode(cls, item):
-        ret = simplejson.loads(item)
-        return ret
+        if item:
+            ret = simplejson.loads(item)
+            return ret
+        return None
 
     @classmethod
     def enqueue(cls, klass, *args):
@@ -76,6 +79,10 @@ def queues(cls, server="localhost:6379"):
         resq = cls(server)
         return resq._redis.smembers("queues")
 
+    #@classmethod
+    #def working(cls, server="localhost:6379"):
+    #    resq = cls(server)
+    #    return Worker.working(resq)
 class Stat(object):
     def __init__(self, name, resq):
         self.name = name

src/pyres/worker.py

@@ -105,6 +105,9 @@ def working_on(self, job):
         data = simplejson.dumps(data)
         self.resq._redis.set("worker:%s" % str(self), data)
 
+    def job(self):
+        return ResQ.decode(self.resq._redis.get("worker:%s" % self)) or {}
+    
     def done_working(self):
         self.processed()
         self.resq._redis.delete("worker:%s" % str(self))
@@ -128,6 +131,8 @@ def job(self):
         return {}
 
     def __str__(self):
+        if getattr(self,'id', None):
+            return self.id
         import os; 
         hostname = os.uname()[1]
         pid = os.getpid()
@@ -137,7 +142,35 @@ def __str__(self):
     def run(cls, queues, host):
         worker = cls(queues=queues, host=host)
         worker.work()
-
+    @classmethod
+    def all(cls, host):
+        resq = ResQ(host)
+        return resq._redis.smembers('workers')
+    @classmethod
+    def working(cls, host):
+        resq = ResQ(host)
+        total = []
+        for key in Worker.all(host):
+            if Worker.exists(key,resq):
+                total.append(key)
+        #total = [id if Worker.exists(id,resq) for id in resq.redis.smembers('workers')]
+        names = [Worker.find(key[7:],resq) for key in resq._redis.mget(*total)] if total else []
+        return names
+    
+    @classmethod
+    def find(cls, worker_id, resq):
+        if Worker.exists(worker_id, resq):
+            queues = worker_id.split(':')[-1].split(',')
+            worker = cls(queues,resq._server)
+            worker.id = worker_id
+            return worker
+        else:
+            return None
+    
+    @classmethod
+    def exists(cls, worker_id, resq):
+        return resq._redis.sismember('workers', worker_id)
+    
 class JuniorWorker(Worker):
     def work(self, interval=5):
         self.startup()

src/resweb/core/templates/working.html

@@ -1,38 +1,36 @@
 {% extends "base.html" %}
 {%block main%}
-<% workers = resque.working %>
-<h1><%= workers.size %> of <%= resque.workers.size %> Workers Working</h1>
+<h1>{{current_count}} of {{total_workers}} Workers Working</h1>
 <table>
   <tr>
     <th>&nbsp;</th>
     <th>Where</th>
     <th>Queue</th>
     <th>Processing</th>
   </tr>
-  <% if workers.empty? %>
+  {% if not workers %}
   <tr>
     <td colspan="4">Not a one.</td>
   </tr>
-  <% end %>
+  {% endif %}
 
-  <% for worker in workers.sort_by { |w| w.job['run_at'] ? w.job['run_at'] : '' } %>
-    <% job = worker.job %>
+  {% for worker in workers %}
+    
     <tr>
-      <td><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
-      <% host, pid, queues = worker.to_s.split(':') %>
-      <td><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
+      <td><img src="" alt="" title=""></td>
+      <td><a href="#">{{worker._host}}:{{worker._pid}}</a></td>
       <td>
-        <a class="queue" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>
+        <a class="queue" href="#">{{worker.job.queue}}</a>
       </td>
       <td>
-        <% if job['queue'] %>
-          <code><%= job['payload']['class'] %></code>
-          <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= job['run_at'] %></a></small>
-        <% else %>
+        {% if worker.job.queue %}
+          <code>{{ worker.job.payload.klass }}</code>
+          <small><a class="queue time" href="#">{{worker.job.run_at}}</a></small>
+        {% else %}
           Waiting for more
-        <% end %>
+        {% endif %}
       </td>
     </tr>
-  <% end %>
+  {% endfor %}
 </table>
 {%endblock%}

src/resweb/core/views.py

@@ -4,6 +4,7 @@
 from resweb.decorators import render_to
 from pyres import ResQ
 from pyres.failure import Failure
+from pyres.worker import Worker
 class Queue(object):
     def __init__(self, name, count):
         self.name = name
@@ -21,9 +22,15 @@ def index(request):
 
 @render_to('working.html')
 def working(request):
-    current = request.resq.working()
-    total_workers = len(request.resq.workers())
-    return {}
+    workers = []
+    for worker in Worker.working(request.resq._server):
+        host, pid, queues = str(worker).split(':')
+        worker._host
+        worker._pid
+        workers.append(worker)
+    current_count = len(workers)
+    total_workers = len(Worker.all(settings.RESQ_HOST))
+    return locals()
 
 def failed(request):
     return {}