Adding stoptimeout and stopparentfirst for clean shutdown support

lib/daemon.js

@@ -96,6 +96,29 @@ var daemon = function(config) {
       configurable: false,
       value: config.group || 'root'
     },
+
+    /**
+     * @cfg {Boolean} [stopparentfirst=false]
+     * Allow the service to shutdown cleanly.
+     */
+    stopparentfirst: {
+      enumerable: true,
+      writable: false,
+      configurable: false,
+      value: config.stopparentfirst
+    },
+
+    /**
+     * @cfg {Number} [stoptimeout=30]
+     * How long to wait in seconds before force killing the application.
+     * This only takes effect when stopparentfirst is enabled.
+     */
+    stoptimeout: {
+      enumerable: true,
+      writable: false,
+      configurable: false,
+      value: config.stoptimeout || 30
+    },
 
     system: {
       enumerable: false,

lib/systemd.js

@@ -138,6 +138,8 @@ var init = function(config){
             env: '',
             created: new Date(),
             execpath: process.execPath,
+            stopparentfirst: config.stopparentfirst,
+            stoptimeout: config.stoptimeout
           };
 
           var _env = [];

lib/systemv.js

@@ -167,6 +167,7 @@ var init = function(config){
             env: '',
             created: new Date(),
             execpath: process.execPath,
+            stoptimeout: config.stoptimeout
           };
 
           // escape the double quotes in the wrappercode args here if we are on a redhat system

lib/templates/systemd/service

@@ -8,6 +8,12 @@ SyslogIdentifier={{label}}
 User={{user}}
 Group={{group}}
 Environment={{env}}
+{{#stopparentfirst}}
+KillMode=process
+{{/stopparentfirst}}
+{{#stoptimeout}}
+TimeoutStopSec={{stoptimeout}}
+{{/stoptimeout}}
 
 [Install]
 WantedBy=multi-user.target

lib/templates/systemv/debian

@@ -66,6 +66,7 @@ INIT_SCRIPT_NAME=`basename $THIS_ARG`
 INIT_SCRIPT_NAME_NOEXT=${INIT_SCRIPT_NAME%.*}
 PIDFILE="$LOCAL_VAR_RUN/$INIT_SCRIPT_NAME_NOEXT.pid"
 SCRIPTNAME=/etc/init.d/$INIT_SCRIPT_NAME
+STOPTIMEOUT={{stoptimeout}}
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] ||  { echo "can't find Node.js ($DAEMON)"  >&2; exit 0; }
@@ -147,7 +148,7 @@ do_stop()
   #   2 if daemon could not be stopped
   #   other if a failure occurred
 
-  start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --chuid $NODEUSER --name $LABEL
+  start-stop-daemon --stop --quiet --retry=TERM/$STOPTIMEOUT/KILL/5 --pidfile $PIDFILE --chuid $NODEUSER --name $LABEL
   RETVAL="$?"
 
   #[ "$VERBOSE" != no ] && [ "$RETVAL" = 1 ] && log_daemon_msg  "  --->  SIGKILL failed => hardkill $DESC" "$INIT_SCRIPT_NAME_NOEXT"

lib/templates/systemv/redhat

@@ -36,6 +36,17 @@ do_stop()
   echo -n "Stopping $LABEL:"
   PID=`cat ${PIDFILE}`
   kill $PID > /dev/null
+  TIMEOUT={{stoptimeout}}
+  # wait for process to exit
+  # if waiting longer than the timeout send a SIGKILL
+  while kill -0 $PID 2>/dev/null; do 
+    if [ $TIMEOUT -le 0 ]; then
+      kill -9 $PID
+      echo "Process didn't exit before timeout, sent SIGKILL"
+    fi
+    sleep 1;
+    ((TIMEOUT--));
+  done;
   if [ -f ${LOCK_FILE} ] ; then
     rm ${LOCK_FILE}
   fi

lib/wrapper.js

@@ -169,6 +169,9 @@ var launch = function(){
       console.error(argv.f+' exited with error code '+code);
       process.exit();
       server.unref();
+    } else if (forcekill) {
+      process.exit();
+      server.unref();
     }
 
     delete child.pid;
@@ -183,15 +186,13 @@ process.on('exit',function(){
   console.log("Got exit signal, closing down");
   forcekill = true;
   child.kill();
-  process.exit();
 });
 
 // Killing the wrapper does not kill the child node process without this handler
 process.on('SIGTERM',function(){
   console.log("Got SIGTERM, closing down");
   forcekill = true;
   child.kill();
-  process.exit();
 });
 
 process.on('uncaughtException', function(err) {