[Piuparts-commits] rev 517 - in piatti/home: piupartsm/bin piupartss/bin

[Holger Levsen]

Author: holger
Date: 2009-10-08 12:59:27 +0000 (Thu, 08 Oct 2009)
New Revision: 517

Modified:
   piatti/home/piupartsm/bin/detect_slave_problems
   piatti/home/piupartss/bin/slave_run
Log:
bugfix

Modified: piatti/home/piupartsm/bin/detect_slave_problems
===================================================================
--- piatti/home/piupartsm/bin/detect_slave_problems	2009-10-08 12:45:16 UTC (rev 516)
+++ piatti/home/piupartsm/bin/detect_slave_problems	2009-10-08 12:59:27 UTC (rev 517)
@@ -48,8 +48,8 @@
 chown piupartsm.piuparts $MONITORDIR
 chmod 775 $MONITORDIR
 
-# ~piupartss/bin/slave_run deletes screenlog.old so we know piuparts-slave has just been started 
-mv screenlog.new screenlog.old 2>/dev/null || cp $SCREENLOG screenlog.old
+# ~piupartss/bin/slave_run deletes screenlog* and touches screenlog.new for detecting piuparts-slave has just been started 
+mv screenlog.new screenlog.old 2>/dev/null
 cp $SCREENLOG screenlog.new
 
 # dont complain if just started

Modified: piatti/home/piupartss/bin/slave_run
===================================================================
--- piatti/home/piupartss/bin/slave_run	2009-10-08 12:45:16 UTC (rev 516)
+++ piatti/home/piupartss/bin/slave_run	2009-10-08 12:59:27 UTC (rev 517)
@@ -31,6 +31,6 @@
 
 screen -L -d -m -S piuparts-slave-screen su - piupartss -c "cd /org/piuparts.debian.org/slave && python ../share/piuparts/piuparts-slave"
 
-rm $MONITORDIR/screenlog.new
+rm $MONITORDIR/screenlog.new $MONITORDIR/screenlog.old
 touch $MONITORDIR/screenlog.new
 chmod 775 $MONITORDIR/screenlog.new