diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-19 00:47:41 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-19 00:47:41 +0200 |
| commit | d6f160876cca336469d2fd047486b8520d3ab3d7 (patch) | |
| tree | 2750cfc92d1642566b7e6433c3bcef015f48b215 /pyload/webui/app | |
| parent | Merge pull request #7 from ardi69/0.4.10 (diff) | |
| parent | added: colred logs for webui to (currently only for theme "Next") (diff) | |
| download | pyload-d6f160876cca336469d2fd047486b8520d3ab3d7.tar.xz | |
Merge pull request #8 from ardi69/0.4.10
colored logs for webui to
Diffstat (limited to 'pyload/webui/app')
| -rw-r--r-- | pyload/webui/app/pyloadweb.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pyload/webui/app/pyloadweb.py b/pyload/webui/app/pyloadweb.py index 0d4bbfe51..b3baed3eb 100644 --- a/pyload/webui/app/pyloadweb.py +++ b/pyload/webui/app/pyloadweb.py @@ -399,6 +399,7 @@ def logs(item=-1): warning = "" conf = PYLOAD.getConfigValue("log", "file_log") + color_template = PYLOAD.getConfigValue("log", "color_template") if PYLOAD.getConfigValue("log", "color_console") else "" if not conf: warning = "Warning: File log is disabled, see settings page." @@ -445,7 +446,7 @@ def logs(item=-1): if counter >= item: try: date, time, level, message = l.decode("utf8", "ignore").split(" ", 3) - dtime = datetime.strptime(date + ' ' + time, '%d.%m.%Y %H:%M:%S') + dtime = datetime.strptime(date + ' ' + time, '%Y-%m-%d %H:%M:%S') except Exception: dtime = None date = '?' @@ -469,7 +470,8 @@ def logs(item=-1): return render_to_response('logs.html', {'warning': warning, 'log': data, 'from': fro.strftime('%d.%m.%Y %H:%M:%S'), 'reversed': reversed, 'perpage': perpage, 'perpage_p': sorted(perpage_p), 'iprev': 1 if item - perpage < 1 else item - perpage, - 'inext': (item + perpage) if item + perpage < len(log) else item}, + 'inext': (item + perpage) if item + perpage < len(log) else item, + 'color_template': color_template}, [pre_processor]) |