emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of name vs RC_SVCNAME consistent in supervisor scripts

Browse Source 
This fixes #79.
This commit is contained in:
William Hubbs 2016-09-13 12:27:08 -05:00
parent ac53c9a658
commit 8a8032478a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sh/runit.sh
View File

@ -21,7 +21,7 @@ runit_start()
ebegin "Starting ${name:-$RC_SVCNAME}" ebegin "Starting ${name:-$RC_SVCNAME}"
ln -snf "${service_path}" "${service_link}" ln -snf "${service_path}" "${service_link}"
sv start "${service_link}" > /dev/null 2>&1 sv start "${service_link}" > /dev/null 2>&1
eend $? "Failed to start $RC_SVCNAME" eend $? "Failed to start ${name:-$RC_SVCNAME}"
} }
runit_stop() runit_stop()
@ -36,7 +36,7 @@ runit_stop()
ebegin "Stopping ${name:-$RC_SVCNAME}" ebegin "Stopping ${name:-$RC_SVCNAME}"
sv stop "${service_link}" > /dev/null 2>&1 && sv stop "${service_link}" > /dev/null 2>&1 &&
rm "${service_link}" rm "${service_link}"
eend $? "Failed to stop $RC_SVCNAME" eend $? "Failed to stop ${name:-$RC_SVCNAME}"
} }
runit_status() runit_status()

4
sh/s6.sh
View File

@ -30,7 +30,7 @@ s6_start()
sleep 1.5 sleep 1.5
set -- $(s6-svstat "${s6_service_link}") set -- $(s6-svstat "${s6_service_link}")
[ "$1" = "up" ] [ "$1" = "up" ]
eend $? "Failed to start $RC_SVCNAME" eend $? "Failed to start ${name:-$RC_SVCNAME}"
} }
s6_stop() s6_stop()
@ -44,7 +44,7 @@ s6_stop()
s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}" s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
set -- $(s6-svstat "${s6_service_link}") set -- $(s6-svstat "${s6_service_link}")
[ "$1" = "down" ] [ "$1" = "down" ]
eend $? "Failed to stop $RC_SVCNAME" eend $? "Failed to stop ${name:-$RC_SVCNAME}"
} }
s6_status() s6_status()

4
sh/start-stop-daemon.sh
View File

@ -46,7 +46,7 @@ ssd_start()
${command_user+--user} $command_user \ ${command_user+--user} $command_user \
$_background $start_stop_daemon_args \ $_background $start_stop_daemon_args \
-- $command_args $command_args_background -- $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}" service_set_value "command" "${command}"
[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}" [ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
@ -80,7 +80,7 @@ ssd_stop()
${pidfile:+--pidfile} $chroot$pidfile \ ${pidfile:+--pidfile} $chroot$pidfile \
${stopsig:+--signal} $stopsig ${stopsig:+--signal} $stopsig
eend $? "Failed to stop $RC_SVCNAME" eend $? "Failed to stop ${name:-$RC_SVCNAME}"
} }
ssd_status() ssd_status()

4
sh/supervise-daemon.sh
View File

@ -31,7 +31,7 @@ supervise_start()
[ -n "${chroot}" ] && service_set_value "chroot" "${chroot}" [ -n "${chroot}" ] && service_set_value "chroot" "${chroot}"
[ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
fi fi
eend $rc "failed to start $RC_SVCNAME" eend $rc "failed to start ${name:-$RC_SVCNAME}"
} }
supervise_stop() supervise_stop()
@ -46,7 +46,7 @@ supervise_stop()
${pidfile:+--pidfile} $chroot$pidfile \ ${pidfile:+--pidfile} $chroot$pidfile \
${stopsig:+--signal} $stopsig ${stopsig:+--signal} $stopsig
eend $? "Failed to stop $RC_SVCNAME" eend $? "Failed to stop ${name:-$RC_SVCNAME}"
} }
supervise_status() supervise_status()