From af70862a7a115d6269affca663423e9340d6e929 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 2 Dec 2018 15:15:51 -0600 Subject: supervise-daemon: use a default pid file if one is not specified Since the pid file is internal to us, start moving toward deprecating it by not requiring the user to specify it. In the next release, I plan on working on code to start phasing out the use of a pid file if this is possible. --- sh/supervise-daemon.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sh') diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh index d12c54eb..69d74593 100644 --- a/sh/supervise-daemon.sh +++ b/sh/supervise-daemon.sh @@ -30,6 +30,7 @@ supervise_start() ${chroot:+--chroot} $chroot \ ${output_log+--stdout} ${output_log} \ ${error_log+--stderr} $error_log \ + ${pidfile:+--pidfile} $pidfile \ ${respawn_delay:+--respawn-delay} $respawn_delay \ ${respawn_max:+--respawn-max} $respawn_max \ ${respawn_period:+--respawn-period} $respawn_period \ @@ -43,6 +44,7 @@ supervise_start() rc=$? if [ $rc = 0 ]; then [ -n "${chroot}" ] && service_set_value "chroot" "${chroot}" + [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" fi eend $rc "failed to start ${name:-$RC_SVCNAME}" } @@ -50,9 +52,13 @@ supervise_start() supervise_stop() { local startchroot="$(service_get_value "chroot")" + local startpidfile="$(service_get_value "pidfile")" chroot="${startchroot:-$chroot}" + pidfile="${startpidfile:-$pidfile}" ebegin "Stopping ${name:-$RC_SVCNAME}" supervise-daemon "${RC_SVCNAME}" --stop \ + ${pidfile:+--pidfile} $chroot$pidfile \ + ${stopsig:+--signal} $stopsig eend $? "Failed to stop ${name:-$RC_SVCNAME}" } -- cgit v1.2.3