From 664f603b499c218cbba59ff89328b668223926b8 Mon Sep 17 00:00:00 2001 From: Nicolas Hennion Date: Sat, 1 Jun 2013 17:26:10 +0200 Subject: [PATCH] Refactoring in the script to comply Debian policy (Thk to https://github.com/mxjeff) --- docs/init_script | 160 +++++++++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 60 deletions(-) diff --git a/docs/init_script b/docs/init_script index 6fa8ac40..34698bdd 100644 --- a/docs/init_script +++ b/docs/init_script @@ -1,25 +1,24 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: glances -# Required-Start: networking -# Required-Stop: networking +# Required-Start: $remote_fs $local_fs $network +# Required-Stop: $remote_fs $local_fs $network # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Start and stop the Glance server +# Short-Description: Starts and daemonize Glances server +# Description: Starts and daemonize Glances server ### END INIT INFO -# Author: beudbeud@beudibox.fr - -set -e # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Glances server" NAME=glances -DAEMON=/usr/bin/$NAME -DAEMON_ARGS="" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME +USER=$NAME +DAEMON="/usr/bin/$NAME" +PIDFILE="/run/$NAME/$NAME.pid" +CONF="/etc/glances/glances.conf" +DAEMON_ARGS="-C $CONF -s" # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 @@ -30,62 +29,103 @@ SCRIPTNAME=/etc/init.d/$NAME # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh - # Define LSB log_* functions. # Depend on lsb-base (>= 3.2-14) to ensure that this file is present # and status_of_proc is working. . /lib/lsb/init-functions -case $1 in - start) - if [ -e $PIDFILE ]; then - log_daemon_msg "$NAME process was already running" - log_end_msg 1 - else - # Start the daemon. - log_daemon_msg "Starting the process" "$NAME" - # Start the daemon with the help of start-stop-daemon - # Log the message appropriately - if start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE -b -m --exec $DAEMON -- -s $DAEMON_ARGS; then - log_end_msg 0 - else - log_end_msg 1 - fi - fi - ;; +# Ensure /run/glances is there, cf. Debian policy 9.4.1 +# http://www.debian.org/doc/debian-policy/ch-opersys.html#s-fhs-run +if [ ! -d "$(dirname $PIDFILE)" ]; then + mkdir "$(dirname $PIDFILE)" + chown $USER:$USER "$(dirname $PIDFILE)" + chmod 755 "$(dirname $PIDFILE)" +fi - stop) - # Stop the daemon. - if [ -e $PIDFILE ]; then - status_of_proc -p $PIDFILE $DAEMON "Stoppping the $NAME process" && status="0" || status="$?" - if [ "$status" = 0 ]; then - start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE - /bin/rm -rf $PIDFILE - fi - else - log_daemon_msg "Glances process was already stopped" - log_end_msg 1 - fi - ;; +# +# Function that starts the daemon/service +# +do_start() +{ + log_daemon_msg "Starting $DESC" "$NAME " + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + [ -e $PIDFILE ] && PID=$(cat "$PIDFILE") + if ( [ -e $PIDFILE ] && ps -p $PID 1>&2 > /dev/null ) + then + log_action_end_msg 1 "already running, PID's $PID" + exit 0 + elif ( [ -w $PIDFILE ] ) + then + log_warning_msg "PID file found while ${NAME} is not running, removing file." + rm $PIDFILE + fi - restart|reload) - # Restart the daemon. - $0 stop && sleep 2 && $0 start - ;; + if [ "$RUN" != "true" ]; then + log_action_msg "Not starting glances: disabled by /etc/default/$NAME". + exit 0 + fi - status) - # Check the status of the process. - if [ -e $PIDFILE ]; then - status_of_proc -p $PIDFILE $DAEMON "$NAME process" && exit 0 || exit $? - else - log_daemon_msg "Glances process is not running" - log_end_msg 1 - fi - ;; + start-stop-daemon --start --chuid $USER --pidfile=$PIDFILE --quiet -m -b --exec $DAEMON -- $DAEMON_ARGS || return 2 + [ -e "$PIDFILE" ] && chown $USER $PIDFILE + return 0 +} - *) - # For invalid arguments, print the usage message. - echo "Usage: $0 {start|stop|restart|reload|status}" - exit 2 - ;; -esac +# +# Function that stops the daemon/service +# +do_stop() +{ + log_daemon_msg "Stopping $DESC" "$NAME " + if [ ! -w $PIDFILE ] + then + log_warning_msg "PID file not found" + return 4 + fi + start-stop-daemon --stop --oknodo --chuid $USER --pidfile=$PID --user=$USER --pidfile="$PIDFILE" --retry=30 || return 1 + /bin/rm -f $PIDFILE + return 0 +} + +case "$1" in + start) + do_start + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + stop) + do_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; + esac + ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" + ;; + restart|force-reload) + do_stop + case "$?" in + 0) + log_end_msg 0 + do_start + case "$?" in + 0) log_end_msg 0 ;; + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: invoke-rc.d $NAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac \ No newline at end of file