Merge branch 'vierja-ended_time'

main
Vincent Driessen 12 years ago
commit 743cf3cd74

@ -3,6 +3,7 @@ import os
import errno import errno
import random import random
import time import time
import times
try: try:
from procname import setprocname from procname import setprocname
except ImportError: except ImportError:
@ -394,6 +395,7 @@ class Worker(object):
# use the same exc handling when pickling fails # use the same exc handling when pickling fails
pickled_rv = dumps(rv) pickled_rv = dumps(rv)
job._status = Status.FINISHED job._status = Status.FINISHED
job.ended_at = times.now()
except: except:
# Use the public setter here, to immediately update Redis # Use the public setter here, to immediately update Redis
job.status = Status.FAILED job.status = Status.FAILED
@ -419,6 +421,7 @@ class Worker(object):
p = self.connection.pipeline() p = self.connection.pipeline()
p.hset(job.key, 'result', pickled_rv) p.hset(job.key, 'result', pickled_rv)
p.hset(job.key, 'status', job._status) p.hset(job.key, 'status', job._status)
p.hset(job.key, 'ended_at', times.format(job.ended_at, 'UTC'))
if result_ttl > 0: if result_ttl > 0:
p.expire(job.key, result_ttl) p.expire(job.key, result_ttl)
self.log.info('Result is kept for %d seconds.' % result_ttl) self.log.info('Result is kept for %d seconds.' % result_ttl)

Loading…
Cancel
Save