DrTrigon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113993
Change subject: improvements; * link to info page (and return/back link) *
table with entries for every single logfile * section headings * < prev | next
> browser for logfiles (view history resp. go back in time)
......................................................................
improvements;
* link to info page (and return/back link)
* table with entries for every single logfile
* section headings
* < prev | next > browser for logfiles (view history resp. go back in time)
Change-Id: I0b6ff2d0adcd68d2cea2e7f37f6bede11e7af12e
---
M public_html/cgi-bin/panel.py
M public_html/cgi-bin/ps_wikinew.py
M public_html/cgi-bin/templates/info.html
M public_html/cgi-bin/templates/layout.html
4 files changed, 64 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/drtrigonbot
refs/changes/93/113993/1
diff --git a/public_html/cgi-bin/panel.py b/public_html/cgi-bin/panel.py
index de2b6bb..80ef5ca 100755
--- a/public_html/cgi-bin/panel.py
+++ b/public_html/cgi-bin/panel.py
@@ -64,10 +64,19 @@
<img src="%(botstate_wui)s" width="15" height="15"
alt="Botstate: wui"><br><br>
Time now: %(time)s<br><br>
-%(loglink)s gathered bot status message log: <b>%(botlog)s</b><br><br>
+Latest gathered bot status message log: <b>%(botlog)s</b><br><br>
Successfully finished bot runs: <b>%(successfull)s</b><br><br>
-Current log files: %(currentlog)s<br>
+
+<h2>Log files</h2>
+Current log files:
+<table class="wikitable">
+%(currentlog)s
+</table>
+%(logbrowse)s
+
<a href="%(oldlink)s">Old log</a> files: <i>%(oldlog)s</i><br><br>
+
+<h2>Messages</h2>
See also <a href="%(logstat)s">logging statistics</a> and the important
messages:
<p style="white-space:pre-wrap;">%(messages)s</p>
<br>"""
@@ -528,17 +537,29 @@
(localdir, files, current) = oldlogfiles()
files = [item for key, value in files for item in value] #
flatten
+ # < prev | next > browsing
+ date = form.getvalue('date', None)
+ if date:
+ current = [item for item in files if date in item]
+ today = datetime.datetime.strptime(date, '%Y-%m-%d')
+ else:
+ today = datetime.datetime.today()
+ yesterday = (today - datetime.timedelta(days=1)).strftime('%Y-%m-%d')
+ tomorrow = (today + datetime.timedelta(days=1)).strftime('%Y-%m-%d')
+ data['logbrowse'] = "<a href='?date=%s'>< prev</a> | <a
href='?'>now</a>" % yesterday
+ if (datetime.datetime.today() - today) >= datetime.timedelta(days=2):
+ data['logbrowse'] += " | <a href='?date=%s'>next ></a><br><br>"
% tomorrow
+ data['logbrowse'] += "<br><br>"
+
stat, recent = logging_statistics(current, botcontinuous)
if stat is None:
data['botlog'] = 'n/a'
data['messages'] = 'n/a'
data['successfull'] = "n/a"
- data['loglink'] = 'Latest'
else:
data['botlog'] = stat['lastmessage']
data['messages'] = "\n".join(stat['messages'])
data['successfull'] = "%s of %s" % (stat['ecount']['end'],
stat['ecount']['start'])
- data['loglink'] = '<a href="%s">Latest</a>' %
os.path.join(links['log'][style.host(os.environ)], recent)
lastrun = max([os.stat(os.path.join(localdir, item)).st_mtime for item
in files]+[0])
botmsg = data['botlog'].strip()
@@ -586,7 +607,35 @@
status += "<tr style='background-color:
%(color)s'><td>%(bot)s</td><td>%(state)s</td></tr>\n" % {'color':
irc_wui_color, 'bot': 'wui:', 'state': irc_wui_state_text}
# ('replace' below is a lapbs patch)
- data['currentlog'] = ", ".join([ '<a href="%s">%s</a>' %
(os.path.join(localdir, item).replace('public_html/', ''), item) for item in
current ])
+ data['currentlog'] = []
+ for item in current:
+ s, r = logging_statistics([item], [])#botcontinuous)
+ if not s:
+ s = {'lastmessage': 'n/a', 'ecount': {'end': 'n/a',
'start': 'n/a'}}
+ logfile = os.path.join(localdir, item)
+ lasttime = os.stat(logfile).st_mtime
+ logstate = botstate_img['red']
+ if (lasttime-time()) <= (bottimeout*60*60):
+ if (s['lastmessage'] == botdonemsg) and not
(s['ecount']['end'] - s['ecount']['start']):
+ logstate = botstate_img['green']
+ elif (botmsg.find(botdonemsg) == 0):
+ logstate = botstate_img['orange']
+ else:
+ logstate = botstate_img['orange']
+ data['currentlog'].append( '<tr%s><td><a
href="%s">%s</a></td><td>%s</td><td>%s of %s</td><td>%s</td><td><img src="%s"
width="15" height="15" alt=""></td></tr>' %
+ (' bgcolor="#CCCCCC"' if item == recent
else '',
+ logfile.replace('public_html/', ''),
item,
+ s['lastmessage'],
+ s['ecount']['end'],
s['ecount']['start'],
+ asctime(localtime(lasttime)),
+ logstate) )
+ data['currentlog'].append( '<tr%s><td><b>%s</b></td><td>%s</td><td>%s
of %s</td><td></td><td><img src="%s" width="15" height="15" alt=""></td></tr>' %
+ (' style="font-weight:bold;"',
+ 'Summary / Total',
+ stat['lastmessage'],
+ stat['ecount']['end'],
stat['ecount']['start'],
+ data['botstate_daily']) )
+ data['currentlog'] = "\n".join(data['currentlog'])
data.update({ 'time': asctime(localtime(time())),
'oldlog': ", ".join(files),
diff --git a/public_html/cgi-bin/ps_wikinew.py
b/public_html/cgi-bin/ps_wikinew.py
index fab684d..ef5cc5f 100644
--- a/public_html/cgi-bin/ps_wikinew.py
+++ b/public_html/cgi-bin/ps_wikinew.py
@@ -61,9 +61,10 @@
href="/" title="Home"></a></div>
<div class="portal" id='p-navigation'><h5>navigation</h5><div class="body">
<ul>
-<li><a href="https://wiki.toolserver.org/view/User:DrTrigon";>Main Page</a>, <a
href="https://labsconsole.wikimedia.org/wiki/DrTrigonBot";>labs</a></li>
-<li><a href="https://jira.toolserver.org/browse/DrTrigon";>Bug tracker</a></li>
-<li><a href="https://fisheye.toolserver.org/browse/drtrigon";>SVN
repository</a></li>
+<li><a href="https://wiki.toolserver.org/view/User:DrTrigon";>TS</a> / <a
href="https://labsconsole.wikimedia.org/wiki/DrTrigonBot";>labs</a> Main
Page</li>
+<li><a
href="https://bugzilla.wikimedia.org/describecomponents.cgi?product=Tool%%20Labs%%20tools";>Bugzilla</a>
tracker</li>
+<li><a href="https://fisheye.toolserver.org/browse/drtrigon";>SVN</a> / <a
href="https://gerrit.wikimedia.org/r/#/admin/projects/?filter=pywikibot";>GIT</a>
repository</li>
+<li><a href="info.py">Info</a></li>
</ul>
</div></div>
<div class="portal" id='p-status'><h5>status</h5><div class="body">
diff --git a/public_html/cgi-bin/templates/info.html
b/public_html/cgi-bin/templates/info.html
index f06695b..b998a9f 100644
--- a/public_html/cgi-bin/templates/info.html
+++ b/public_html/cgi-bin/templates/info.html
@@ -1,5 +1,6 @@
{% extends "layout.html" %}
{% block body %}
+ <small><a href="panel.py">< back</a></small>
<p><b>Server Architecture</b>: {{ arch.desc }}</p>
<p><b>Flask</b>: {{ flask.desc }}</p>
{% if compat %}
diff --git a/public_html/cgi-bin/templates/layout.html
b/public_html/cgi-bin/templates/layout.html
index 1251e09..c0c67c2 100644
--- a/public_html/cgi-bin/templates/layout.html
+++ b/public_html/cgi-bin/templates/layout.html
@@ -7,7 +7,8 @@
<!-- Idea to use Wiki stylesheet from:
http://toolserver.org/~vvv/sulutil.php
BUT this is the new!! (done by myself) -->
<!--<link rel="stylesheet"
href="http://bits.wikimedia.org/de.wikipedia.org/load.php?debug=false&lang=de&modules=ext%21wikihiero%7Cmediawiki%21legacy%21commonPrint%7Cmediawiki%21legacy%21shared%7Cskins%21vector&only=styles&skin=vector";
type="text/css" media="all">-->
- <link rel="stylesheet"
href="//bits.wikimedia.org/de.wikipedia.org/load.php?debug=false&lang=de&modules=ext.gadget.CommonsDirekt%2CExtra-Editbuttons%2CVorlagenmeister%2Cold-movepage%7Cext.rtlcite%2Cwikihiero%7Cext.uls.nojs%7Cext.visualEditor.viewPageTarget.noscript%7Cmediawiki.legacy.commonPrint%2Cshared%7Cmw.PopUpMediaTransform%7Cskins.vector&only=styles&skin=vector&*"
>
+ <!--<link rel="stylesheet"
href="//bits.wikimedia.org/de.wikipedia.org/load.php?debug=false&lang=de&modules=ext.gadget.CommonsDirekt%2CExtra-Editbuttons%2CVorlagenmeister%2Cold-movepage%7Cext.rtlcite%2Cwikihiero%7Cext.uls.nojs%7Cext.visualEditor.viewPageTarget.noscript%7Cmediawiki.legacy.commonPrint%2Cshared%7Cmw.PopUpMediaTransform%7Cskins.vector&only=styles&skin=vector&*"
>-->
+ <link rel="stylesheet"
href="//bits.wikimedia.org/de.wikipedia.org/load.php?debug=false&lang=de&modules=ext.echo.badge%7Cext.gadget.CommonsDirekt%2CExtra-Editbuttons%2CVorlagenmeister%2Cold-movepage%7Cext.visualEditor.viewPageTarget.noscript%7Cext.wikihiero%7Cmediawiki.legacy.commonPrint%2Cshared%7Cskins.common.interface%7Cskins.vector.styles&only=styles&skin=vector&*"
>
<link rel="stylesheet" href="../tsnotice.css">
<meta http-equiv="refresh" content="{{ refresh }}">
</head>
@@ -61,9 +62,9 @@
{% endif %}
<div class="portal" id='p-navigation'><h5>navigation</h5><div class="body">
<ul>
- <li><a href="https://wiki.toolserver.org/view/User:DrTrigon";>Main
Page</a>, <a
href="https://labsconsole.wikimedia.org/wiki/DrTrigonBot";>labs</a></li>
- <li><a href="https://jira.toolserver.org/browse/DrTrigon";>Bug
tracker</a></li>
- <li><a href="https://fisheye.toolserver.org/browse/drtrigon";>SVN
repository</a></li>
+ <li><a href="https://wiki.toolserver.org/view/User:DrTrigon";>TS</a> / <a
href="https://labsconsole.wikimedia.org/wiki/DrTrigonBot";>labs</a> Main
Page</li>
+ <li><a
href="https://bugzilla.wikimedia.org/describecomponents.cgi?product=Tool%20Labs%20tools";>Bugzilla</a>
tracker</li>
+ <li><a href="https://fisheye.toolserver.org/browse/drtrigon";>SVN</a> /
<a
href="https://gerrit.wikimedia.org/r/#/admin/projects/?filter=pywikibot";>GIT</a>
repository</li>
</ul>
</div></div>
<div class="portal" id='p-status'><h5>status</h5><div class="body">
--
To view, visit https://gerrit.wikimedia.org/r/113993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b6ff2d0adcd68d2cea2e7f37f6bede11e7af12e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
