Merge branch 'unix_timestamps'

Author: Matt George

pyres/failure/redis.py

@@ -1,4 +1,4 @@
-import datetime
+import datetime, time
 from base import BaseBackend
 from pyres import ResQ
 
@@ -10,7 +10,7 @@ def save(self, resq=None):
         if not resq:
             resq = ResQ()
         data = {
-            'failed_at' : str(datetime.datetime.now()),
+            'failed_at' : int(time.mktime(datetime.datetime.now().timetuple())),
             'payload'   : self._payload,
             'error'     : self._parse_message(self._exception),
             'backtrace' : self._parse_traceback(self._traceback),

pyres/worker.py

@@ -3,7 +3,7 @@
 from pyres import ResQ, Stat
 import logging
 import signal
-import datetime
+import datetime, time
 import os, sys
 import time
 import json_parser as json
@@ -43,18 +43,19 @@ def register_worker(self):
         self.started = datetime.datetime.now()
 
 
-    def _set_started(self, time):
-        if time:
-            self.resq.redis.set("resque:worker:%s:started" % self, time.strftime('%Y-%m-%d %H:%M:%S'))
+    def _set_started(self, dt):
+        if dt:
+            key = int(time.mktime(dt.timetuple()))
+            self.resq.redis.set("resque:worker:%s:started" % self, key)
         else:
             self.resq.redis.delete("resque:worker:%s:started" % self)
 
     def _get_started(self):
         datestring = self.resq.redis.get("resque:worker:%s:started" % self)
-        ds = None
-        if datestring:
-            ds = datetime.datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')
-        return ds
+        #ds = None
+        #if datestring:
+        #    ds = datetime.datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')
+        return datestring
 
     started = property(_get_started, _set_started)
 
@@ -177,7 +178,7 @@ def working_on(self, job):
         logging.debug('marking as working on')
         data = {
             'queue': job._queue,
-            'run_at': str(datetime.datetime.now()),
+            'run_at': int(time.mktime(datetime.datetime.now().timetuple())),
             'payload': job._payload
         }
         data = json.dumps(data)

resweb/views.py

@@ -105,7 +105,7 @@ def workers(self):
             if data.has_key('queue'):
                 item['data'] = True
                 item['code'] = data['payload']['class']
-                item['runat'] = data['run_at']
+                item['runat'] = str(datetime.datetime.fromtimestamp(float(data['run_at'])))
             else:
                 item['data'] = False
             item['nodata'] = not item['data']
@@ -155,7 +155,7 @@ def workers(self):
             if data.has_key('queue'):
                 item['data'] = True
                 item['code'] = data['payload']['class']
-                item['runat'] = data['run_at']
+                item['runat'] = str(datetime.datetime.fromtimestamp(float(data['run_at'])))
             else:
                 item['data'] = False
             item['nodata'] = not item['data']
@@ -217,6 +217,7 @@ def failed_jobs(self):
         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['worker_url'] = '/workers/%s/' % job['worker']
             item['payload_args'] = str(job['payload']['args'])
             item['payload_class'] = job['payload']['class']
@@ -387,7 +388,7 @@ def code(self):
     def runat(self):
         data = self._worker.processing()
         if self.data():
-            return str(data['run_at'])
+            return str(datetime.datetime.fromtimestamp(float(data['run_at'])))
         return ''
 
         """

tests/test_worker.py

@@ -3,6 +3,7 @@
 from pyres.job import Job
 from pyres.worker import Worker
 import os
+import time
 class WorkerTests(PyResTests):
     def test_worker_init(self):
         from pyres.exceptions import NoQueueError
@@ -140,8 +141,8 @@ def test_started(self):
         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')
+        assert self.redis.get('resque:worker:%s:started' % name) == str(int(time.mktime(dt.timetuple())))
+        assert worker.started == str(int(time.mktime(dt.timetuple())))
         worker.started = None
         assert not self.redis.exists('resque:worker:%s:started' % name)