Skip to content

supervisor=s6: configurable reload signal via reloadsig variable #1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skarnet wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −4
Open

supervisor=s6: configurable reload signal via reloadsig variable #1052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions sh/s6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# command, command_args, command_args_foreground (command will be interpreted by sh)
# output_logger, error_logger, output_log, error_log (the former two are mutually exclusive)
# input_file, directory, chroot, umask, command_user
# notify (only fd), stopsig
# notify (only fd), stopsig, reloadsig
#
# Extra variables:
# Timeouts: all in milliseconds, 0 for infinity, undefined for no waiting
Expand Down Expand Up @@ -135,7 +135,18 @@ _s6_servicedir_create() {
echo "$timeout_kill" > "$dir/timeout-kill"
fi
if test -n "$stopsig" ; then
echo "$stopsig" > "$dir/down-signal"
if kill -s "$stopsig" 0 ; then
echo "$stopsig" > "$dir/down-signal"
else
ewarn "Invalid stop signal: $stopsig"
fi
fi
if test -n "$reloadsig" ; then
if kill -s "$reloadsig" 0 ; then
echo "$reloadsig" > "$dir/reload-signal"
else
ewarn "Invalid reload signal: $reloadsig"
fi
fi

{
Expand Down Expand Up @@ -252,6 +263,6 @@ s6_status() {
s6_reload() {
_s6_set_variables
ebegin "Reloading $name"
s6-svc -h -- "$_service"
eend $? "s6-svc -h command failed"
s6-svc -l -- "$_service"
eend $? "s6-svc -l command failed"
}
Loading