more items for resweb

Also found some issues in the worker module that
I went ahead and fixed and tested

Author: Matt George

src/pyres/worker.py

@@ -28,11 +28,27 @@ def validate_queues(self):
     def register_worker(self):
         self.resq.redis.sadd('workers',str(self))
         #self.resq._redis.add("worker:#{self}:started", Time.now.to_s)
+        self.started = datetime.datetime.now()
         #Stat.clear("processed:#{self}")
         #Stat.clear("failed:#{self}")
 
+    def _set_started(self, time):
+        if time:
+            self.resq.redis.set("worker:%s:started" % self, time.strftime('%Y-%m-%d %H:%M:%S'))
+        else:
+            self.resq.redis.delete("worker:%s:started" % self)
+    
+    def _get_started(self):
+        datestring = self.resq.redis.get("worker:%s:started" % self)
+        ds = None
+        if datestring:
+            ds = datetime.datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')
+        return ds
+    started = property(_get_started, _set_started)
+    
     def unregister_worker(self):
         self.resq.redis.srem('workers',str(self))
+        self.started = None
 
     def startup(self):
         self.register_signal_handlers()
@@ -140,12 +156,16 @@ def processed(self):
         total_processed.incr()
         worker_processed.incr()
 
+    def get_processed(self):
+        return Stat("processed:%s" % str(self), self.resq).get()
+    
     def failed(self):
         total_failed = Stat("failed", self.resq)
         stat = Stat("failed:%s" % self, self.resq)
         total_failed.incr()
         stat.incr()
-    
+    def get_failed(self):
+        return Stat("failed:%s" % self, self.resq).get()
     def job(self):
         data = self.resq.redis.get("worker:%s" % self)
         if data:

src/resweb/server.py

@@ -1,9 +1,20 @@
 from itty import *
 from pyres import ResQ
 from pyres.failure import Failure
-from pyres.worker import Worker
-from views import Overview, Queues, Workers, Working, Failed, Stats
+from views import (
+    Overview, 
+    Queues, 
+    Queue, 
+    Workers, 
+    Working, 
+    Failed, 
+    Stats, 
+    Stat, 
+    Worker
+)
+
 HOST = "localhost:6379"
+MY_ROOT = os.path.join(os.path.dirname(__file__), 'media')
 #resq = ResQ(HOST)
 
 @get("/")
@@ -18,33 +29,43 @@ def working(request):
 def queues(request):
     return str(Queues(HOST).render())
 
-@get('/queue/(?P<queue_id>\w+)/')
+@get('/queues/(?P<queue_id>\w+)/')
 def queue(request, queue_id):
-    return str(Queues(HOST, queue_id).render())
+    return str(Queue(HOST, queue_id).render())
 
 @get('/failed/')
 def failed(request):
     return str(Failed(HOST).render())
 
-@get('/workers/(?P<worker_id>\w+)/')
+@get('/workers/(?P<worker_id>\w.+)/')
 def worker(request, worker_id):
-    return str(Worker(worker_id).render())
+    return str(Worker(HOST, worker_id).render())
 
 @get('/workers/')
 def workers(request):
     return str(Workers(HOST).render())
 
 @get('/stats/')
 def stats(request):
-    return str(Stats(HOST).render())
+    raise Redirect('/stats/resque/')
+
+@get('/stats/(?P<key>\w+)/')
+def stats(request, key):
+    return str(Stats(HOST, key).render())
+
+@get('/stat/(?P<stat_id>\w.+)')
+def stat(request, stat_id):
+    return str(Stat(HOST, stat_id).render())
 
 @get('/media/(?P<filename>.+)')
 def my_media(request, filename):
     print filename
+    #return serve_static_file(request, filename)
     #my_media.content_type = content_type(filename)
-    my_root = os.path.join(os.path.dirname(__file__), 'media')
-    output = static_file(filename, root=my_root)
-    return Response(output, content_type=content_type(filename))
+    
+    return serve_static_file(request, filename, root=MY_ROOT)
+    #output = static_file(filename, root=MY_ROOT)
+    #return Response(output, content_type=content_type(filename))
     #return static_file(request, filename=filename, root=my_root)
 
 run_itty()

src/resweb/templates/failed.mustache

@@ -1,2 +1,4 @@
+{{>header}}
 <h1>Failed Jobs</h1>
-Pending Failure module completion!
+Pending Failure module completion!
+{{>footer}}

src/resweb/templates/header.mustache

@@ -4,8 +4,6 @@
   <title>Resque.</title>
   <link href="{{media_folder}}reset.css" media="screen" rel="stylesheet" type="text/css">
   <link href="{{media_folder}}style.css" media="screen" rel="stylesheet" type="text/css">
-  <script src="{{media_folder}}jquery-1.3.2.min.js" type="text/javascript"</script>
-  <script src="{{media_folder}}jquery.relatize_date.js" type="text/javascript"</script>  
 
 </head>
 <body>
@@ -20,6 +18,10 @@
     </ul>
   </div>
 
-  {{sub_nav}}
+  <ul class='subnav'>
+  {{#sub_nav}}
+        <li ><a href="/{{section}}/{{subtab}}/"><span>{{subtab}}</span></a></li>
+  {{/sub_nav}}
+  </ul>
 
 <div id="main">

src/resweb/templates/queue.mustache

@@ -0,0 +1,21 @@
+{{>header}}
+<h1>Pending jobs on <span class='hl'>{{queue}}</span></h1>
+  <p class='sub'>Showing {{start}} to {{end}} of <b>{{size}}</b> jobs</p>
+  <table class='jobs'>
+    <tr>
+      <th>Class</th>
+      <th>Args</th>
+    </tr>
+    {{#jobs}}
+    <tr>
+      <td class='class'>{{class}}</td>
+      <td class='args'>{{args}}</td>
+    </tr>
+    {{/jobs}}
+    {{#empty_job}}
+    <tr>
+      <td class='no-data' colspan='2'>There are no pending jobs in this queue</td>
+    </tr>
+    {{/empty_job}}
+  </table>
+{{>footer}}

src/resweb/templates/queues.mustache

@@ -29,7 +29,7 @@
     </tr>
     {{#queues}}
     <tr>
-      <td class='queue'><a class="queue" href="/queue/{{queue}}">{{queue}}</a></td>
+      <td class='queue'><a class="queue" href="/queues/{{queue}}">{{queue}}</a></td>
       <td class='size'>{{size}}</td>
     </tr>
     {{/queues}}

src/resweb/templates/stat.mustache

@@ -0,0 +1,13 @@
+{{>header}}
+<h1>Key "{{key}}" is a {{key_type}}</h1>
+<h2>size: {{size}}</h2>
+<table>
+    {{#items}}
+    <tr>
+      <td>
+        {{row}}
+      </td>
+    </tr>
+    {{/items}}
+  </table>
+{{>footer}}

src/resweb/templates/stats.mustache

@@ -1,3 +1,37 @@
 {{>header}}
-Coming Soon!
+{{#standard}}
+<h1>{{title}}</h1>
+  <table class='stats'>
+  {{#stats}}
+    <tr>
+      <th>
+        {{key}}
+      </th>
+      <td>
+        {{value}}
+      </td>
+    </tr>
+  {{/stats}}
+  </table>
+{{/standard}}
+{{#resque_keys}}
+<h1>{{title}}</h1>
+<p class='sub'>(All keys are actually prefixed with "resque:")</p>
+    <table class='stats'>
+    <tr>
+        <th>key</th>
+        <th>type</th>
+        <th>size</th>
+    </tr>
+    {{#stats}}
+    <tr>
+        <th>
+        <a href="/stat/{{key}}">{{key}}</a>
+        </th>
+        <td>{{type}}</td>
+        <td>{{size}}</td>
+    </tr>
+  {{/stats}}
+  </table>
+{{/resque_keys}}
 {{>footer}}

src/resweb/templates/worker.mustache

@@ -0,0 +1,37 @@
+{{>header}}
+<h1>Worker {{worker}}</h1>
+  <table class='workers'>
+    <tr>
+      <th>&nbsp;</th>
+      <th>Host</th>
+      <th>Pid</th>
+      <th>Started</th>
+      <th>Queues</th>
+      <th>Processed</th>
+      <th>Failed</th>
+      <th>Processing</th>
+    </tr>
+    <tr>
+      <td class='icon'><img src="/media/{{state}}.png" alt="{{state}}" title="{{state}}"></td>
+      <td>{{host}}</td>
+      <td>{{pid}}</td>
+      <td><span class="time">{{started_at}}</a></td>
+      <td class='queues'>
+      {{#queues}}
+      <a class="queue-tag" href="/queues/{{q}}">{{q}}</a>&nbsp;
+      {{/queues}}
+      </td>
+      <td>{{processed}}</td>
+      <td>{{failed}}</td>
+      <td class='process'>
+          {{#data}}
+              <code>{{code}}</code>
+              <small><a class="queue time" href="/working/{{worker}}">{{runat}}</a></small>
+            {{/data}}
+            {{#nodata}}
+              <span class='waiting'>Waiting for a job...</span>
+            {{/nodata}}
+      </td>
+    </tr>
+  </table>
+{{>footer}}