diff --git a/bin/hwtr b/bin/hwtr index d985e82bb6a01ea418ef794b15521741cb3f743f..1d7fd7ea12f9ca959cd7844984bdfea54c3d1def 100755 --- a/bin/hwtr +++ b/bin/hwtr @@ -32,99 +32,18 @@ PIDFILE=/var/run/$NAME.pid # Function that starts the daemon/service # do_start() { - local status pid - - status=0 - pid=`pidofproc $NAME` || status=$? - case $status in - 0) - echo "$DESC already running ($pid)." - exit 1 - ;; - *) - echo "Starting $DESC ..." - exec $DAEMON -p $HWTR_PORT -c $HWTR_CONFIG $HWTR_ARGS >/dev/null 2>&1 || status=$? - echo "ERROR: Failed to start $DESC." - exit $status - ;; - esac - - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. + echo "Starting $DESC ..." + start-stop-daemon --start --background --pidfile $PIDFILE --make-pidfile --exec $DAEMON -- -p $HWTR_PORT -c $HWTR_CONFIG $HWTR_ARGS >/dev/null 2>&1 || status=$? + echo "." } # # Function that stops the daemon/service # do_stop() { - local pid status - - status=0 - pid=`pidofproc $NAME` || status=$? - case $status in - 0) - # Exit when fail to stop, the kill would complain when fail - kill -s 15 $pid >/dev/null && rm -f $PIDFILE && \ - echo "Stopped $DESC ($pid)." || exit $? - ;; - *) - echo "$DESC is not running; none killed." >&2 - ;; - esac - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - return $status -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - local pid status - - status=0 - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - pid=`pidofproc $NAME` || status=$? - case $status in - 0) - echo "Reloading $DESC ..." - kill -s 1 $pid || exit $? - ;; - *) - echo "$DESC is not running; none reloaded." >&2 - ;; - esac - exit $status -} - - -# -# Function that shows the daemon/service status -# -status_of_proc () { - local pid status - - status=0 - # pidof output null when no program is running, so no "2>/dev/null". - pid=`pidofproc $NAME` || status=$? - case $status in - 0) - echo "$DESC is running ($pid)." - exit 0 - ;; - *) - echo "$DESC is not running." >&2 - exit $status - ;; - esac + echo "Stopping $DESC" + start-stop-daemon --stop --pidfile $PIDFILE + echo "." } case "$1" in @@ -134,32 +53,13 @@ start) stop) do_stop || exit $? ;; -status) - status_of_proc - ;; restart) # Always start the service regardless the status of do_stop do_stop do_start ;; -try-restart|force-reload) - # force-reload is the same as reload or try-restart according - # to its definition, the reload is not implemented here, so - # force-reload is the alias of try-restart here, but it should - # be the alias of reload if reload is implemented. - # - # Only start the service when do_stop succeeds - do_stop && do_start - ;; -#reload) - # If the "reload" action is implemented properly, then let the - # force-reload be the alias of reload, and remove it from - # try-restart|force-reload) - # - #do_reload - #;; *) - echo "Usage: $0 {start|stop|status|restart|try-restart|force-reload}" >&2 + echo "Usage: $0 {start|stop|restart}" >&2 exit 3 ;; esac