[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-43-g310bd7c

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 310bd7c331d56dfc8cf2a535428ec72625c728d7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Feb 11 01:06:04 2013 +0100

    master: get rid of monitor-slave directory
    
    that really belongs to the slave, but as there is currently nothing
    useful using this, drop it entirely
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/crontab-master b/conf/crontab-master
index 97dae4e..cf2628d 100644
--- a/conf/crontab-master
+++ b/conf/crontab-master
@@ -12,11 +12,8 @@
 0 0 * * * $HOME/bin/generate_daily_report
 
 #
-# make sure slave is reminded daily (and also monitored if not started with ~piupartss/bin/slave_run)
-#
-42 0 * * * mkdir -p /org/piuparts.debian.org/master/monitor-slave/ ; rm -f /org/piuparts.debian.org/master/monitor-slave/* ; cp /org/piuparts.debian.org/slave/screenlog.0 /org/piuparts.debian.org/master/monitor-slave/screenlog.new ; chmod -f 775 /org/piuparts.debian.org/master/monitor-slave/screenlog.new
-
 # reschedule old logs twice a day
+#
 00 3,15 * * * $HOME/bin/reschedule_oldest_logs
 
 #
diff --git a/debian/changelog b/debian/changelog
index 2e978e6..85948db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Move to slave-bin and run from slave crontab.
     - Use idle-sleep setting from piuparts.conf.
     - Move statefile to slave-directory.
+  * master: Get rid of the monitor-slave directory.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 15 Jan 2013 11:51:43 +0100
 
diff --git a/debian/piuparts-master.postinst b/debian/piuparts-master.postinst
index e7410aa..c9c9140 100644
--- a/debian/piuparts-master.postinst
+++ b/debian/piuparts-master.postinst
@@ -43,12 +43,15 @@ case "$1" in
     done
 
     install -d -o $muser -g $pgroup -m 0755 $userhome/master
-    install -d -o $muser -g $pgroup -m 0755 $userhome/master/monitor-slave
     install -d -o $muser -g $pgroup -m 0755 $userhome/backup
 
     install -d -o $muser -g $pgroup -m 0755 $userhome/htdocs
     cp -rf $scriptroot/htdocs/* $userhome/htdocs/
 
+    if dpkg --compare-versions "$2" lt-nl "0.50" ; then
+        rm -rf $userhome/master/monitor-slave
+    fi
+
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/slave-bin/slave_run b/slave-bin/slave_run
index c5c083a..259a569 100755
--- a/slave-bin/slave_run
+++ b/slave-bin/slave_run
@@ -23,7 +23,6 @@ set -e
 
 SESSIONNAME=piuparts_slave_screen
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
-MONITORDIR=/org/piuparts.debian.org/master/monitor-slave
 export PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
 
 if pgrep -f share/piuparts/piuparts-slave ; then
@@ -33,7 +32,6 @@ fi
 
 cd /org/piuparts.debian.org/slave
 rm -f $SCREENLOG					# used by ~piupartsm/bin/detect_slave_problems
-rm -f $MONITORDIR/*					# used by several scripts to only warn once a day
 
 trap "cat $SCREENLOG | mail -s 'slave abnormaly ended' piupartsm ; rm $SCREENLOG; exit" TERM EXIT
 screen -L -d -m -S $SESSIONNAME su - piupartss -c "cd /org/piuparts.debian.org/slave && PYTHONPATH=$PYTHONPATH python ../share/piuparts/piuparts-slave"

-- 
piuparts git repository