more change merged

Author: fakechris

src/pyres/worker.py

@@ -29,9 +29,25 @@ def validate_queues(self):
     def register_worker(self):
         self.resq.redis.sadd('resque: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('resque:workers',str(self))
 
@@ -140,11 +156,17 @@ 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("resque:worker:%s" % self)

src/tests.py

@@ -293,6 +293,17 @@ def test_working(self):
         assert str(worker) == str(workers[0])
         assert worker != workers[0]
 
+    def test_started(self):        
+        import datetime        
+        worker = Worker(['basic'])        
+        dt = datetime.datetime.now()        
+        worker.started = dt        
+        name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')        
+        assert self.redis.get('resque:worker:%s:started' % name) == dt.strftime('%Y-%m-%d %H:%M:%S')        
+        assert worker.started == datetime.datetime.strptime(dt.strftime('%Y-%m-%d %H:%M:%S'),'%Y-%m-%d %H:%M:%S')        
+        worker.started = None        
+        assert not self.redis.exists('resque:worker:%s:started' % name)
+        
 class StatTests(PyResTests):
     def test_incr(self):
         stat_obj = Stat('test_stat', self.resq)