Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Properly exit on /etc/init.d/riak status command
When running `/etc/init.d/riak status`, if the status fails
(Riak isn't running) not only should a message print out
that states that fact, but also the exit status should be non-zero.

This change addresses issue #232
  • Loading branch information
jaredmorrow committed Oct 22, 2012
1 parent 71292ce commit a88237a
Showing 1 changed file with 72 additions and 72 deletions.
144 changes: 72 additions & 72 deletions package/deb/debian_riak_init
Expand Up @@ -42,42 +42,42 @@ SCRIPTNAME=/etc/init.d/$NAME
#
do_start()
{
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started

RETVAL=`$DAEMON ping`
[ "$RETVAL" = "pong" ] && return 1
su - riak -c "$DAEMON $DAEMON_ARGS" || return 2
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started

RETVAL=`$DAEMON ping`
[ "$RETVAL" = "pong" ] && return 1

su - riak -c "$DAEMON $DAEMON_ARGS" || return 2
}

#
# Function that stops the daemon/service
#
do_stop()
{
# Try to stop via "riak stop" first
RETVAL=`su - riak -c "$DAEMON ping"`
[ "$RETVAL" = "pong" ] && su - riak -c "$DAEMON stop"
sleep 2
RETVAL=`pidof $ERTS_PATH/beam.smp`
[ "$RETVAL" = "" ] && return 0
#
# It didn't exit nicely, be mean.
#
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
start-stop-daemon --stop \
--quiet \
--retry=TERM/30/KILL/5 \
--user riak \
--exec $ERTS_PATH/beam.smp
return $?
# Try to stop via "riak stop" first
RETVAL=`su - riak -c "$DAEMON ping"`
[ "$RETVAL" = "pong" ] && su - riak -c "$DAEMON stop"
sleep 2
RETVAL=`pidof $ERTS_PATH/beam.smp`
[ "$RETVAL" = "" ] && return 0
#
# It didn't exit nicely, be mean.
#
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
start-stop-daemon --stop \
--quiet \
--retry=TERM/30/KILL/5 \
--user riak \
--exec $ERTS_PATH/beam.smp
return $?
}

#
Expand All @@ -100,55 +100,55 @@ do_status() {

case "$1" in
start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
ping)
# See if the VM is alive
$DAEMON ping || exit $?
;;
# See if the VM is alive
$DAEMON ping || exit $?
;;
reload|force-reload)
log_daemon_msg "Reloading $DESC" "$NAME"
do_reload
log_end_msg $?
;;
log_daemon_msg "Reloading $DESC" "$NAME"
do_reload
log_end_msg $?
;;
restart)
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
0|1)
do_start
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start
esac
;;
*)
# Failed to stop
log_end_msg 1
;;
esac
;;
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
0|1)
do_start
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start
esac
;;
*)
# Failed to stop
log_end_msg 1
;;
esac
;;
status)
do_status
;;
do_status && exit 0 || exit $?
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|ping|restart|force-reload}" >&2
exit 3
;;
echo "Usage: $SCRIPTNAME {start|stop|ping|restart|force-reload}" >&2
exit 3
;;
esac

:
Expand Down

0 comments on commit a88237a

Please sign in to comment.