Commit d5e317ba authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

jqueue: Change log message time format

See the comment in the patch.

Reviewed-by: ultrotter
parent 739be818
...@@ -421,7 +421,7 @@ def PollJob(job_id, cl=None, feedback_fn=None): ...@@ -421,7 +421,7 @@ def PollJob(job_id, cl=None, feedback_fn=None):
if callable(feedback_fn): if callable(feedback_fn):
feedback_fn(msg) feedback_fn(msg)
else: else:
print "%s %s" % (time.ctime(msg[0]), msg[2]) print "%s %s" % (time.ctime(utils.MergeTime(msg[0])), msg[2])
lastmsg = msg lastmsg = msg
time.sleep(1) time.sleep(1)
...@@ -98,7 +98,9 @@ class _QueuedOpCode(object): ...@@ -98,7 +98,9 @@ class _QueuedOpCode(object):
self._log_lock.acquire() self._log_lock.acquire()
try: try:
self.log.append((time.time(), log_type, log_msg)) # The time is split to make serialization easier and not lose more
# precision.
self.log.append((utils.SplitTime(time.time()), log_type, log_msg))
finally: finally:
self._log_lock.release() self._log_lock.release()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment