[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-36-gfb8bdc7

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit fb8bdc72bb92e7b75aa3491acd8130c9d75d9f66
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Jan 26 21:54:08 2013 +0100

    detect_slave_problems: move to slave-bin and run from slave crontab
    
    this is a script for the slave
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/crontab-master b/conf/crontab-master
index 6656279..97dae4e 100644
--- a/conf/crontab-master
+++ b/conf/crontab-master
@@ -12,11 +12,6 @@
 0 0 * * * $HOME/bin/generate_daily_report
 
 #
-# monitor slave session every hour
-#
-23 * * * * $HOME/bin/detect_slave_problems
-
-#
 # 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
diff --git a/conf/crontab-slave b/conf/crontab-slave
index 6ab265e..cbd7c2a 100644
--- a/conf/crontab-slave
+++ b/conf/crontab-slave
@@ -10,6 +10,11 @@
 @reboot $HOME/bin/slave_cleanup ; sudo $HOME/bin/slave_run
 
 #
+# monitor slave session every hour
+#
+16 * * * * $HOME/bin/detect_slave_problems
+
+#
 # monitor for problems every six hours
 #
 23 */6 * * * $HOME/bin/detect_leftover_processes
diff --git a/debian/changelog b/debian/changelog
index 8f6abfc..9119639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * slave_{run,join,cleanup}: Use pgrep to find running processes.
   * detect_leftover_processes: Move statefile to slave-directory.
   * detect_stale_mounts: Merge into detect_tmp_cruft.
-  * detect_tmp_cruft: Move to slave-bin and run from slave
+  * detect_{slave_problems,tmp_cruft}: Move to slave-bin and run from slave
     crontab.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 15 Jan 2013 11:51:43 +0100
diff --git a/master-bin/detect_slave_problems b/slave-bin/detect_slave_problems
similarity index 100%
rename from master-bin/detect_slave_problems
rename to slave-bin/detect_slave_problems

-- 
piuparts git repository