From 5dde26d3c80ada59d8a8b5a702527eff759d5d12 Mon Sep 17 00:00:00 2001 From: Artem Bogomyagkov Date: Wed, 12 Sep 2012 11:10:49 +0300 Subject: [PATCH] simplified code for finished jobs times, updated docs for scrapyd --- scrapyd/webservice.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scrapyd/webservice.py b/scrapyd/webservice.py index 95ce72fb7..3df47f1f1 100644 --- a/scrapyd/webservice.py +++ b/scrapyd/webservice.py @@ -1,7 +1,6 @@ import traceback import uuid from cStringIO import StringIO -from datetime import datetime from twisted.python import log @@ -98,8 +97,8 @@ class ListJobs(WsResource): queue = self.root.poller.queues[project] pending = [{"id": x["_job"], "spider": x["name"]} for x in queue.list()] finished = [{"id": s.job, "spider": s.spider, - "start_time": datetime.isoformat(s.start_time), - "end_time": datetime.isoformat(s.end_time)} for s in self.root.launcher.finished + "start_time": s.start_time.isoformat(' '), + "end_time": s.end_time.isoformat(' ')} for s in self.root.launcher.finished if s.project == project] return {"status":"ok", "pending": pending, "running": running, "finished": finished}