From 259e0951de653dafa87f3f6b6d1d92a92e6800c9 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sat, 3 May 2008 13:35:35 +0200 Subject: [PATCH] Rename daily cronscript to dinstall, as its not run daily for a long time now --- ChangeLog | 8 ++++++++ config/debian/{cron.daily => cron.dinstall} | 21 +++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) rename config/debian/{cron.daily => cron.dinstall} (92%) diff --git a/ChangeLog b/ChangeLog index fc6e9f88..0407faa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-03 Joerg Jaspert + + * config/debian/cron.daily: Rename to + * config/debian/cron.dinstall: this, as its not really something run + daily for some time now. And while dinstall is an OLD name, its + recognized pretty well within Debian + Also add some more timing information + 2008-05-03 Thomas Viehmann * dak/process_unchecked.py (check_hashes): Reject on error while diff --git a/config/debian/cron.daily b/config/debian/cron.dinstall similarity index 92% rename from config/debian/cron.daily rename to config/debian/cron.dinstall index 09d6a6b3..4e3befb7 100755 --- a/config/debian/cron.daily +++ b/config/debian/cron.dinstall @@ -10,7 +10,7 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars # Start logging NOW=`date "+%Y.%m.%d-%H:%M:%S"` -LOGFILE="$logdir/daily_${NOW}.log" +LOGFILE="$logdir/dinstall_${NOW}.log" exec > "$LOGFILE" 2>&1 echo Archive maintenance started at $(date +%X) @@ -109,11 +109,15 @@ echo "Updating fingerprints" # Update fingerprints dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + # Generate override files echo "Writing overrides into text files" cd $overridedir dak make-overrides +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + # FIXME rm -f override.sid.all3 for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done @@ -125,8 +129,14 @@ echo "Generating Packages and Sources files" cd $configdir apt-ftparchive generate apt.conf # Generate *.diff/ incremental updates + +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + echo "Generating pdiff files" dak generate-index-diffs + +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + # Generate Release files echo "Generating Release files" dak generate-releases @@ -158,6 +168,9 @@ cd $scriptsdir ./mkchecksums # rm -f $NOTICE + +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + echo "Trigger daily wanna-build run" ssh buildd@buildd /org/wanna-build/trigger.daily @@ -191,6 +204,8 @@ dak cruft-report > $webdir/cruft-report-daily.txt dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + echo "Updating DM html page" $scriptsdir/dm-monitor >$webdir/dm-uploaders.html @@ -238,10 +253,12 @@ echo "Compress old psql backups" done ) +TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) + echo "Finally, all is done, sending mail and compressing logfile" exec > /dev/null 2>&1 -cat "$LOGFILE" | mail -s "Log for cron.daily run of $(date +%Y.%m.%d)" cron@ftp-master.debian.org +cat "$LOGFILE" | mail -s "Log for dinstall run of $(date +%Y.%m.%d' at '%H:%M)" cron@ftp-master.debian.org bzip2 -9 "$LOGFILE" ################################################################################ -- 2.39.5