Merge pull request #472 from mackerelio/supervise-sysvinit

use supervisor mode in sysvinit script
mackerelio · Jan 12, 2018 · 18a61ce · 18a61ce
2 parents a7bcda3 + eeda97b
commit 18a61ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/packaging/deb/debian/mackerel-agent.init b/packaging/deb/debian/mackerel-agent.init
@@ -40,7 +40,7 @@ do_start()
     # Set large number of file descriptors for the safety sake
     ulimit -n 65536 1>/dev/null 2>&1 || true
     mkdir -m 777 -p $MACKEREL_PLUGIN_WORKDIR
-    MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $DAEMON ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 &
+    MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $DAEMON supervise ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 &
     sleep 3
     kill -0 $(cat $PIDFILE 2>/dev/null) >/dev/null 2>&1
     return $?
@@ -99,22 +99,12 @@ case "$1" in
         ;;
     reload|force-reload)
         do_configtest || exit $?
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
+        log_daemon_msg "Reloading $DESC" "$NAME"
+        start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON
         retval=$?
         case "$retval" in
-            0|1)
-                do_start
-                retval=$?
-                case "$retval" in
-                    0) log_end_msg 0 ;;
-                    *) log_end_msg 1; exit $retval ;; # Failed to start
-                esac
-                ;;
-            *)
-                # Failed to stop
-                log_end_msg 1; exit $retval
-            ;;
+            0) log_end_msg 0 ;;
+            *) log_end_msg 1; exit $retval ;;
         esac
         ;;
     restart)
@@ -150,5 +140,3 @@ case "$1" in
         exit 3
     ;;
 esac
-
-:
diff --git a/packaging/rpm/src/mackerel-agent.initd b/packaging/rpm/src/mackerel-agent.initd
@@ -45,7 +45,7 @@ start() {
     ulimit -n 65536 1>/dev/null 2>&1 || true
     echo -n $"Starting $prog:"
     mkdir -m 777 -p $MACKEREL_PLUGIN_WORKDIR
-    MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $BIN ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 &
+    MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $BIN supervise ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 &
     sleep 3
     if ! kill -0 $(cat $PIDFILE 2>/dev/null) >/dev/null 2>&1; then
         failure
@@ -109,7 +109,7 @@ stop() {
         return 1
     fi
 
-    killproc -p $PIDFILE -QUIT
+    killproc -p $PIDFILE
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
@@ -134,6 +134,15 @@ retire() {
     echo
 }
 
+reload() {
+    configtest_q || return 1
+    echo -n $"Reloading $prog:"
+    killproc -p $PIDFILE $BIN -HUP
+    retval=$?
+    echo
+    return $retval
+}
+
 rh_status() {
     status -p $PIDFILE $prog
 }
@@ -155,8 +164,7 @@ case "$1" in
         exit $retval
         ;;
     reload)
-        configtest_q || exit 1
-        restart
+        $1
         ;;
     restart)
         $1