debian/changelog

@@ -3,7 +3,7 @@ piuparts (0.95) UNRELEASED; urgency=medium
   [ Holger Levsen ]
   * piuparts.py: add /var/lib/debian-security-support/ to self.ignored_files.
     (Closes: #749317)
-  * WIP: reduce number of mails per day, from 34 down to 16, see #912591.
+  * WIP: reduce number of mails per day, from 34 down to 15, see #912591.
     - master-bin/detect_archive_issues: redirect logs to htdocs/logs to spare
       us two mails per day.
     - master-bin/detect_piuparts_issues: redirect logs to htdocs/logs to spare
@@ -12,6 +12,8 @@ piuparts (0.95) UNRELEASED; urgency=medium
       us six mails per day.
     - master-bin/reschedule_oldest_logs: redirect logs to htdocs/logs to spare
       us two mails per day.
+    - master-bin/rotate_master_logs: redirect logs to htdocs/logs to spare
+      us one mail per day.
     - lib/write_log.sh: new helper to publish logs in htdocs/logs.
     - piuparts-report.py: add navigation link to https://piuparts.d.o/logs/
 

master-bin/reschedule_oldest_logs.in

 #!/bin/sh
 
-# Copyright © 2009-2017 Holger Levsen (holger@layer-acht.org)
+# Copyright © 2009-2018 Holger Levsen (holger@layer-acht.org)
 # Copyright © 2011-2012 Andreas Beckmann (anbe@debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it

master-bin/rotate_master_logs.in

@@ -2,6 +2,7 @@
 set -e
 
 # Copyright © 2017 Andreas Beckmann (anbe@debian.org)
+# Copyright © 2018 Holger Levsen (holger@layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -21,14 +22,15 @@ set -e
 # * (delayed) compress rotated master logs
 #
 
-
 . @sharedir@/piuparts/lib/read_config.sh
+. @sharedir@/piuparts/lib/write_log.sh
 
 get_config_value SECTIONS global sections
 get_config_value MASTER global master-directory
-
+get_config_value HTDOCS global output-directory
 
 today=$(date +%Y%m%d)
+OUTPUT=$(mktemp)
 
 cd $MASTER
 for SECTION in $SECTIONS ; do
@@ -37,14 +39,24 @@ for SECTION in $SECTIONS ; do
 
 	# rotate master.log larger than 1 MB
 	if [ -f $mlog ] && [ ! -L $mlog ] && [ $(stat -c %s $mlog) -gt 1048576 ] && [ ! -e $rlog ]; then
-		mv -v $mlog $rlog
+		mv -v $mlog $rlog >> $OUTPUT
 	fi
 
 	# delayed compression of old master.log
 	for log in $SECTION/master.*.log
 	do
 		if [ -f "$log" ] && [ "$log" != "$rlog" ]; then
-			xz -v9 $log
+			xz -v9 $log >> $OUTPUT
 		fi
 	done
 done
+
+if [ -s $OUTPUT ] ; then
+	TEMPORARY_OUTPUT=$(mktemp)
+	echo "$(date -u)" > $TEMPORARY_OUTPUT
+	echo >> $TEMPORARY_OUTPUT
+	cat $OUTPUT >> $TEMPORARY_OUTPUT
+	echo >> $TEMPORARY_OUTPUT
+	publish_logs $TEMPORARY_OUTPUT $HTDOCS rotate_master_logs
+fi
+rm $OUTPUT