X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=tools%2Flogs.py;h=ecb37773fefd5ff8b53101cfae1460276ebe27dc;hp=e88f88990aff9bff729af7704e30b835dd295f85;hb=HEAD;hpb=0fbf46fb7da5309d9fca4761178c1375cb8916ee

diff --git a/tools/logs.py b/tools/logs.py
index e88f8899..ecb37773 100755
--- a/tools/logs.py
+++ b/tools/logs.py
@@ -7,14 +7,14 @@ import os,re,datetime, sys
 import tempfile, time
 
 ITEMS_TO_KEEP = 20
-CACHE_FILE = '/srv/ftp.debian.org/misc/dinstall_time_cache'
+CACHE_FILE = '/srv/ftp-master.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",
+graphs = {"dinstall1": {"keystolist":["pg_dump1", "i18n 1", "accepted", "dominate", "generate-filelist", "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', "pkg-file-mapping" ],
@@ -46,7 +46,7 @@ if m:
     raise Exception("I don't like command line arguments including char '%s'"%m.group(0))
 
 if args:
-  for l in os.popen('bzgrep -H "Archive maintenance timestamp" "'+'" "'.join(args)+'"'):
+  for l in os.popen('bzgrep -H "^Archive maintenance timestamp" "'+'" "'.join(args)+'"'):
     m = LINE.match(l)
     if not m:
         raise Exception("woops '%s'"%l)