X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Flogs.py;h=c4eb6bea15add578d5ed1681db7924e3f35edfd8;hb=1c2f6a140859239486d697caa26fbd6c6155e936;hp=d77d7d20b01c39c41527b3949c82e313f84ed8f5;hpb=faf17643a889cf93d99f5b1cb597ebe85090d5b7;p=dak.git diff --git a/tools/logs.py b/tools/logs.py index d77d7d20..c4eb6bea 100755 --- a/tools/logs.py +++ b/tools/logs.py @@ -11,13 +11,13 @@ CACHE_FILE = '/srv/ftp.debian.org/misc/dinstall_time_cache' GRAPH_DIR = '/srv/ftp.debian.org/web/stat' LINE = re.compile(r'(?:|.*/)dinstall_(\d{4})\.(\d{2})\.(\d{2})-(\d{2}):(\d{2}):(\d{2})\.log(?:\.bz2)?:'+ - r'Archive maintenance timestamp \d+ \(([^\)]*)\): (\d{2}):(\d{2}):(\d{2})$') + r'Archive maintenance timestamp \(([^\)]*)\): (\d{2}):(\d{2}):(\d{2})$') UNSAFE = re.compile(r'[^a-zA-Z/\._:0-9\- ]') graphs = {"dinstall1": {"keystolist":["pg_dump1", "i18n 1", "accepted", "make-suite-file-list", "apt-ftparchive", "pdiff", "release files", "w-b", "i18n 2", "apt-ftparchive cleanup"], "showothers":True}, - "dinstall2": {"keystolist":['External Updates', 'p-u-new', 'o-p-u-new', 'cruft', 'import-keyring', 'overrides', 'cleanup', 'scripts', 'mirror hardlinks', 'stats', 'compress'], + "dinstall2": {"keystolist":['External Updates', 'p-u-new', 'o-p-u-new', 'cruft', 'import-keyring', 'overrides', 'cleanup', 'scripts', 'mirror hardlinks', 'stats', 'compress', "pkg-file-mapping" ], "showothers":False}, "totals":{"keystolist":["apt-ftparchive", "apt-ftparchive cleanup"],"showothers":True}}