]> err.no Git - dak/commitdiff
dinstall
authorJoerg Jaspert <joerg@debian.org>
Thu, 4 Jun 2009 19:08:49 +0000 (21:08 +0200)
committerJoerg Jaspert <joerg@debian.org>
Thu, 4 Jun 2009 19:08:49 +0000 (21:08 +0200)
no longer number the timestamps

Signed-off-by: Joerg Jaspert <joerg@debian.org>
config/debian/cron.dinstall
tools/logs.py

index 3322a87d58ee4a0bab18711c6e7fb8266c38c97b..b4680d81fadfa496fcbb44c8b26bb9223c9c2550 100755 (executable)
@@ -46,8 +46,7 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 
 # Timestamp. Used for dinstall stat graphs
 function ts() {
-        TS=$(($TS+1));
-        echo "Archive maintenance timestamp $TS ($1): $(date +%H:%M:%S)"
+        echo "Archive maintenance timestamp ($1): $(date +%H:%M:%S)"
 }
 
 # Cleanup actions
@@ -538,8 +537,6 @@ DINSTALLSTART="${lockdir}/dinstallstart"
 # Marker for dinstall end
 DINSTALLEND="${lockdir}/dinstallend"
 
-# Timestamps start at -1. so first gets 0
-TS=-1
 touch "${DINSTALLSTART}"
 ts "startup"
 
index e88f88990aff9bff729af7704e30b835dd295f85..c4eb6bea15add578d5ed1681db7924e3f35edfd8 100755 (executable)
@@ -11,7 +11,7 @@ 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",