Merge lp:~thedac/charms/precise/daisy-retracer/fix-restart-script into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

[David Ames]

Set the upstart kill timeout to give the code a chance to clean up after itself
Fix retracer-cache-restart.sh script to not delete the top level directory,
Remove references to supervisor
Default the mailto to root so the cron will run if mailto is not set

=== modified file 'config.yaml'
--- config.yaml	2014-03-19 18:19:12 +0000
+++ config.yaml	2014-03-21 15:49:39 +0000
@@ -115,7 +115,7 @@
       type: string
       description: Region deploying to. Used by nrpe to define servicegroup
   mailto:
-      default: ''
+      default: 'root'
       type: string
       description: Where to send mail on failure.
   max-disk-usage-pct:

=== modified file 'hooks/common'
--- hooks/common	2013-10-08 15:08:57 +0000
+++ hooks/common	2014-03-21 15:49:39 +0000
@@ -75,6 +75,7 @@
 description "error tracker retracer for $arch"
 respawn
 respawn limit 5 60
+kill timeout 180
 env PYTHONPATH=$LOCAL_CONFIG_LOCATION:$CODE_LOCATION:$APPORT_LOCATION:$DEPLOY_ROOT
 export PYTHONPATH
 env PATH=$APPORT_LOCATION/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

=== modified file 'templates/retracers-cache-restart.sh.tmpl'
--- templates/retracers-cache-restart.sh.tmpl	2014-03-20 23:17:46 +0000
+++ templates/retracers-cache-restart.sh.tmpl	2014-03-21 15:49:39 +0000
@@ -11,7 +11,7 @@
 lockfile='/var/lock/retracers-cache-restart.lock'
 max_disk_usage_pct=${MAX_DISK_USAGE_PCT}
 restart_flag='/tmp/retracers_last_restart.flag'
-maintenance_file="${VAR_DIR}/supervisor-maintenance.txt"
+maintenance_file="${VAR_DIR}/retracer-cache-maintenance.txt"
 
 log()
 {
@@ -49,9 +49,7 @@
 
 if [[ $run_cleanup -eq 1 ]]; then
     touch ${maintenance_file}
-    log "Shutting down retracers and supervisord"
-    # Sometimes it can hang waiting to be stopped so restart first which seems
-    # to do the trick.
+    log "Shutting down the retracers"
     for x in $(ls /etc/init/retracer-*); do
         job=$(basename $x | sed s/.conf//)
         status $job | grep -qs running && sudo stop $job
@@ -88,7 +86,7 @@
     set -e
 
     log "Cleaning up cache directories"
-    find $CACHE_DIR -maxdepth 2 -name "cache*" -type d -print0 | xargs --null --no-run-if-empty rm -rf
+    find $CACHE_DIR -maxdepth 2 -name "cache-*" -type d -print0 | xargs --null --no-run-if-empty rm -rf
 
     # XXX: LP#991696
     log "Cleaning out tmp directories"