From: Hans-Christoph Steiner Date: Wed, 17 Jan 2018 14:18:05 +0000 (+0100) Subject: wiki: log checkupdates start/stop time and command line for each run X-Git-Tag: 1.0.1~35^2~11 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fc4f5a79a79b87619527623b58572dabb2bfd730;p=fdroidserver.git wiki: log checkupdates start/stop time and command line for each run --- diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index a303f7fe..66c33608 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -23,6 +23,7 @@ import urllib.request import urllib.error import time import subprocess +import sys from argparse import ArgumentParser import traceback import html @@ -512,6 +513,7 @@ def checkupdates_app(app): config = None options = None +start_timestamp = time.gmtime() def main(): @@ -580,6 +582,27 @@ def main(): logging.error(_("...checkupdate failed for {appid} : {error}") .format(appid=appid, error=e)) + if config.get('wiki_server') and config.get('wiki_path'): + try: + import mwclient + site = mwclient.Site((config['wiki_protocol'], config['wiki_server']), + path=config['wiki_path']) + site.login(config['wiki_user'], config['wiki_password']) + + # Write a page with the last build log for this version code + wiki_page_path = 'checkupdates_' + time.strftime('%s', start_timestamp) + newpage = site.Pages[wiki_page_path] + txt = '' + txt += "* command line: " + ' '.join(sys.argv) + "\n" + txt += "* started at " + common.get_wiki_timestamp(start_timestamp) + '\n' + txt += "* completed at " + common.get_wiki_timestamp() + '\n' + txt += "\n\n" + newpage.save(txt, summary='Run log') + newpage = site.Pages['checkupdates'] + newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect') + except Exception as e: + logging.error(_('Error while attempting to publish log: %s') % e) + logging.info(_("Finished")) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 439a9991..456b6e99 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -3012,6 +3012,9 @@ def get_examples_dir(): return examplesdir -def get_wiki_timestamp(): +def get_wiki_timestamp(timestamp=None): """Return current time in the standard format for posting to the wiki""" - return time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + + if timestamp is None: + timestamp = time.gmtime() + return time.strftime("%Y-%m-%d %H:%M:%SZ", timestamp)