[dak/master] dinstall
no longer number the timestamps
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/cron.dinstall | 5 +----
tools/logs.py | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 3322a87..b4680d8 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -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"
diff --git a/tools/logs.py b/tools/logs.py
index e88f889..c4eb6be 100755
--- a/tools/logs.py
+++ b/tools/logs.py
@@ -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",
--
1.5.6.5
Reply to: