Merge pull request #44 from basho/jhc-redhat

Convert RPM init script to fall in line with Redhat style

Author: jaredmorrow

priv/base/runner

@@ -123,12 +123,14 @@ case "$1" in
             exit $ES
         fi
 
+        # Tell nodetool to stop
         $NODETOOL stop
         ES=$?
         if [ "$ES" -ne 0 ]; then
             exit $ES
         fi
 
+        # Now wait for the app to *really* stop
         while `kill -s 0 $PID 2>/dev/null`;
         do
             sleep 1

priv/templates/rpm/init.script

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # {{package_name}}
 #
@@ -17,66 +17,124 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="{{package_shortdesc}}"
 NAME={{package_install_name}}
 DAEMON=/usr/{{bin_or_sbin}}/$NAME
+lockfile=/var/lock/subsys/$NAME
+pidfile=/var/run/$NAME/$NAME.pid
 
 # Check for script, config and data dirs
 [ -x /usr/{{bin_or_sbin}}/$NAME ] || exit 0
 [ -d /etc/$NAME ] || exit 0
 [ -d /var/lib/$NAME ] || exit 0
-[ -d /var/run/$NAME ] || exit 0
 
+status -p $pidfile -l $(basename $lockfile) $NAME >/dev/null 2>&1
+running=$?
+
+check_pid_status() {
+    pid=$(ps ax | grep beam.smp | grep "\-progname $NAME" | awk '{print $1}')
+    if [ "$pid" = "" ]; then
+        # prog not running?
+        return 1
+    else
+        # running
+        return 0
+    fi
+}
 
 start() {
-        # Start daemons.
-        echo -n $"Starting {{package_install_name}}: "
-        su - {{package_install_user}} -c "$DAEMON start" && success || failure $"$NAME start"
-        RETVAL=$?
-        [ $RETVAL -eq 0 ]
-        echo
-        return $RETVAL
+    # Start daemons.
+    echo -n $"Starting {{package_install_name}}: "
+    $DAEMON start
+    RETVAL=$?
+    if [ $RETVAL -eq 0 ]; then
+        touch $lockfile
+        success
+    else
+        failure $"$NAME start"
+    fi
+    echo
+    return $RETVAL
 }
 
 stop() {
-        # Stop daemon.
-        echo -n $"Stopping {{package_install_name}}: "
-        $DAEMON stop 2>/dev/null 1>&2
-        sleep 2
-        # Check if the process is still running, muting output of getpid
-        MUTE=`$DAEMON getpid`
-        [ "$?" -ne 0 ] && success && echo && return 0 || failure $"$NAME stop"
-        sleep 10
-        MUTE=`$DAEMON getpid`
-        [ "$?" -ne 0] && success && echo && return 0 || failure $"$NAME failed to stop"
-        echo
-        return 1
-
+    # Stop daemon.
+    echo -n $"Shutting down {{package_install_name}}: "
+    $DAEMON stop 2>/dev/null
+    for n in $(seq 1 10); do
+        sleep 1
+        check_pid_status
+        RETVAL=$?
+        if [ $RETVAL -eq 1 ]; then
+            break
+        fi
+    done
+    if [ $RETVAL -eq 1 ]; then
+        rm -f $lockfile $pidfile
+        success
+    else
+        failure $"$NAME stop"
+    fi
+    echo
+    return $RETVAL
 }
 
-status() {
-        # Check status of daemon
-        $DAEMON ping && success && echo $"$NAME is running..." && return 0 || failure $"$NAME is stopped"
-        return 2
+hardstop() {
+    echo -n $"Shutting down $NAME: "
+    su - {{package_install_user}} -c "ps -ef | grep beam.smp | grep '\-progname $NAME ' | grep -v grep | awk '{print \$2}' | xargs kill -9"
+    for n in $(seq 1 10); do
+        sleep 1
+        check_pid_status
+        RETVAL=$?
+        if [ $RETVAL -eq 1 ]; then
+            break
+        fi
+    done
+    if [ $RETVAL -eq 1 ]; then
+        rm -f $lockfile $pidfile
+        success
+    else
+        failure $"$NAME hardstop"
+    fi
+    echo
+    return $RETVAL
 }
 
 # See how we were called.
 case "$1" in
-  start)
+    start)
+        [ $running -eq 0 ] && exit 0
         start
         ;;
-  stop)
-        stop
+    stop)
+        if [ $running -eq 0 ]; then
+            stop
+        else
+            check_pid_status
+            RETVAL=$?
+            if [ $RETVAL -eq 1 ]; then
+                rm -f $lockfile $pidfile
+            fi
+            exit 0
+        fi
         ;;
-  restart)
-        stop
+    restart|force-reload)
+        [ $running -eq 0 ] && stop
         start
         ;;
-  ping)
-        $DAEMON ping || exit $?
+    hardstop)
+        [ $running -eq 0 ] || exit 0
+        hardstop
         ;;
-  status)
-        status && exit 0 || exit $?
+    condrestart|try-restart)
+        [ $running -eq 0 ] || exit 0
+        restart
+        ;;
+    status)
+        status -p $pidfile -l $(basename $lockfile) $NAME
+        ;;
+    ping)
+        $DAEMON ping || exit $?
         ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|ping|status}"
+    *)
+        echo $"Usage: $0 {start|stop|restart|force-reload|hardstop|condrestart|try-restart|status|ping}"
         exit 1
 esac