[Piuparts-commits] [piuparts] 01/01: slave-run: properly delete all screenlogs from previous runs.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 45ff6b2911c028c575997b13267743ae00840645
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Aug 1 17:01:25 2017 -0400

    slave-run: properly delete all screenlogs from previous runs.
---
 debian/changelog                   | 2 +-
 slave-bin/detect_slave_problems.in | 2 +-
 slave-bin/slave_run.in             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7951fc3..d202030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 piuparts (0.79) UNRELEASED; urgency=medium
 
-  * … 
+  * slave-run: properly delete all screenlogs from previous runs.
 
  -- Holger Levsen <holger at debian.org>  Mon, 31 Jul 2017 13:35:18 -0400
 
diff --git a/slave-bin/detect_slave_problems.in b/slave-bin/detect_slave_problems.in
index 2e72040..28f340e 100755
--- a/slave-bin/detect_slave_problems.in
+++ b/slave-bin/detect_slave_problems.in
@@ -44,7 +44,7 @@ get_config_value SLAVEROOT global slave-directory
 get_config_value IDLE_SLEEP global idle-sleep 1800
 
 
-SCREENLOG=$SLAVEROOT/screenlog.0
+SCREENLOG=$SLAVEROOT/screenlog.1
 STATEFILE=$SLAVEROOT/slave-problems
 
 # clear the statefile daily and whine again
diff --git a/slave-bin/slave_run.in b/slave-bin/slave_run.in
index 9163aec..d56a107 100755
--- a/slave-bin/slave_run.in
+++ b/slave-bin/slave_run.in
@@ -35,7 +35,7 @@ get_config_value SLAVECOUNT global slave-count 1
 export PYTHONPATH
 
 SESSIONNAME=piuparts_slave_screen
-SCREENLOG=$SLAVEROOT/screenlog.0
+SCREENLOG=$SLAVEROOT/screenlog
 
 if ! screen -ls $SESSIONNAME | grep -q "No Sockets found" ; then
 	echo "piuparts-slave is already running!"
@@ -46,7 +46,7 @@ fi
 
 # cleanup cruft from previous runs
 @sharedir@/piuparts/slave/slave_cleanup
-rm -f $SCREENLOG
+rm -f $SCREENLOG.*
 
 # ensure the temporary directory exists
 mkdir -p $PIUPARTS_TMPDIR

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git