From 47aa716630252ae0699b21a7201d5a2b5450ee3d Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 14 Sep 2009 20:35:07 -0300 Subject: [PATCH] adapted web console to use unix timestamps for uptime instead of datetime --- scrapy/management/web.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scrapy/management/web.py b/scrapy/management/web.py index 57a4c4f55..e2036bf49 100644 --- a/scrapy/management/web.py +++ b/scrapy/management/web.py @@ -6,7 +6,7 @@ See docs/topics/webconsole.rst import re import socket -from datetime import datetime +from time import time from twisted.internet import reactor from twisted.web import server, resource @@ -38,11 +38,12 @@ def banner(module=None): s += "Scrapy\n" s += "\n" s += "

Scrapy web console

\n" - now = datetime.now() - uptime = now - scrapyengine.start_time - s += "

Bot: %s | Host: %s | Uptime: %s | Time: %s

\n" % (settings['BOT_NAME'], socket.gethostname(), str(uptime), str(now.replace(microsecond=0))) + uptime = time() - scrapyengine.start_time + s += "

Bot: %s | Host: %s | Uptime: %ds

\n" % \ + (settings['BOT_NAME'], socket.gethostname(), uptime) if module: - s += "

%s

\n" % (module.webconsole_id, module.webconsole_name) + s += "

%s

\n" % (module.webconsole_id, \ + module.webconsole_name) return s class WebConsoleResource(resource.Resource): @@ -52,7 +53,8 @@ class WebConsoleResource(resource.Resource): def modules(self): if not hasattr(self, '_modules'): self._modules = {} - for _, obj in dispatcher.send(signal=webconsole_discover_module, sender=self.__class__): + for _, obj in dispatcher.send(signal=webconsole_discover_module, \ + sender=self.__class__): self._modules[obj.webconsole_id] = obj return self._modules