Make use of name vs RC_SVCNAME consistent in supervisor scripts
This fixes #79.
This commit is contained in:
parent
ac53c9a658
commit
8a8032478a
@ -21,7 +21,7 @@ runit_start()
|
||||
ebegin "Starting ${name:-$RC_SVCNAME}"
|
||||
ln -snf "${service_path}" "${service_link}"
|
||||
sv start "${service_link}" > /dev/null 2>&1
|
||||
eend $? "Failed to start $RC_SVCNAME"
|
||||
eend $? "Failed to start ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
runit_stop()
|
||||
@ -36,7 +36,7 @@ runit_stop()
|
||||
ebegin "Stopping ${name:-$RC_SVCNAME}"
|
||||
sv stop "${service_link}" > /dev/null 2>&1 &&
|
||||
rm "${service_link}"
|
||||
eend $? "Failed to stop $RC_SVCNAME"
|
||||
eend $? "Failed to stop ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
runit_status()
|
||||
|
4
sh/s6.sh
4
sh/s6.sh
@ -30,7 +30,7 @@ s6_start()
|
||||
sleep 1.5
|
||||
set -- $(s6-svstat "${s6_service_link}")
|
||||
[ "$1" = "up" ]
|
||||
eend $? "Failed to start $RC_SVCNAME"
|
||||
eend $? "Failed to start ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
s6_stop()
|
||||
@ -44,7 +44,7 @@ s6_stop()
|
||||
s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
|
||||
set -- $(s6-svstat "${s6_service_link}")
|
||||
[ "$1" = "down" ]
|
||||
eend $? "Failed to stop $RC_SVCNAME"
|
||||
eend $? "Failed to stop ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
s6_status()
|
||||
|
@ -46,7 +46,7 @@ ssd_start()
|
||||
${command_user+--user} $command_user \
|
||||
$_background $start_stop_daemon_args \
|
||||
-- $command_args $command_args_background
|
||||
if eend $? "Failed to start $RC_SVCNAME"; then
|
||||
if eend $? "Failed to start ${name:-$RC_SVCNAME}"; then
|
||||
service_set_value "command" "${command}"
|
||||
[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
|
||||
[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
|
||||
@ -80,7 +80,7 @@ ssd_stop()
|
||||
${pidfile:+--pidfile} $chroot$pidfile \
|
||||
${stopsig:+--signal} $stopsig
|
||||
|
||||
eend $? "Failed to stop $RC_SVCNAME"
|
||||
eend $? "Failed to stop ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
ssd_status()
|
||||
|
@ -31,7 +31,7 @@ supervise_start()
|
||||
[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
|
||||
[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
|
||||
fi
|
||||
eend $rc "failed to start $RC_SVCNAME"
|
||||
eend $rc "failed to start ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
supervise_stop()
|
||||
@ -46,7 +46,7 @@ supervise_stop()
|
||||
${pidfile:+--pidfile} $chroot$pidfile \
|
||||
${stopsig:+--signal} $stopsig
|
||||
|
||||
eend $? "Failed to stop $RC_SVCNAME"
|
||||
eend $? "Failed to stop ${name:-$RC_SVCNAME}"
|
||||
}
|
||||
|
||||
supervise_status()
|
||||
|
Loading…
Reference in New Issue
Block a user