1 files changed, 39 insertions, 14 deletions
diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly
index 6dfa811a4..3263002a1 100644
--- a/config/alert-tracks-debian.ugly
+++ b/config/alert-tracks-debian.ugly
@@ -13,33 +13,58 @@
 # !!(*= $daemon_name *)!! Start the WhatDoTheyKnow email alert daemon
 
 NAME=!!(*= $daemon_name *)!!
-DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/alert-tracks-daemon
+DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner
+DAEMON_ARGS="--daemon TrackMailer.alert_tracks_loop"
 PIDFILE=/data/vhost/!!(*= $vhost *)!!/alert-tracks.pid
+LOGFILE=/data/vhost/!!(*= $vhost *)!!/logs/alert-tracks.log
 DUSER=!!(*= $user *)!!
 
 trap "" 1
 
 export PIDFILE
 
+quietly_start_daemon() {
+    start-stop-daemon --quiet --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS
+}
+
+start_daemon() {
+    start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS \
+      > "$LOGFILE" 2>&1
+}
+
+stop_daemon() {
+    start-stop-daemon --stop --pidfile "$PIDFILE"
+}
+
+restart() { stop; start; }
+
 case "$1" in
+  check)
+      quietly_start_daemon
+      if [ $? -ne 1 ]
+      then
+          echo "WhatDoTheyKnow alert daemon was not running; restarting now"
+      fi
+      ;;
+  
   start)
-    echo -n "Starting WhatDoTheyKnow alert daemon: $NAME"
-    start-stop-daemon --start --pidfile $PIDFILE --chuid $DUSER --exec $DAEMON > /dev/null
-    ;;
-
+      echo -n "Starting WhatDoTheyKnow alert daemon: $NAME"
+      start_daemon
+      ;;
+  
   stop)
-    echo -n "Stopping WhatDoTheyKnow alert daemon: $NAME"
-    start-stop-daemon --stop --pidfile $PIDFILE --oknodo
-    ;;
-
+        echo -n "Stopping WhatDoTheyKnow alert daemon: $NAME"
+        stop_daemon
+        ;;
+  
   restart)
-    echo -n "Restarting WhatDoTheyKnow alert daemon: $NAME"
-    start-stop-daemon --stop --pidfile $PIDFILE --oknodo
-    start-stop-daemon --start --pidfile $PIDFILE --chuid $DUSER --exec $DAEMON > /dev/null
-    ;;
+      echo -n "Restarting WhatDoTheyKnow alert daemon: $NAME"
+      stop_daemon
+      start_daemon
+      ;;
 
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart}"
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|check}"
     exit 1
     ;;
 esac