d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon(8): Don't block SIGTERM during restart delay

Browse Source 
I believe this was introduced in the original '-r' commit, r231911 (2012).
At the time, the scope was limited to a 1 second sleep.  r332518 (2018)
added '-R', which increased the potential duration of the affected interval
(from 1 to N seconds) by permitting arbitrary restart intervals.

Instead, handle SIGTERM normally during restart-sleep, when the monitored
process is not running, and shut down promptly.

(I noticed this behavior when debugging a child process that exited quickly
under the 'daemon -r -R 30' environment.  'kill <daemonpid>' had no
immediate effect and the monitor process slept until the next restart
attempt.  This was annoying.)

Reviewed by:	allanjude, imp, markj
Differential Revision:	https://reviews.freebsd.org/D20509
This commit is contained in:
cem 2019-06-04 16:07:01 +00:00
parent 5ae3d73fb8
commit 175ae3661a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/daemon/daemon.c
View File

@ -359,12 +359,13 @@ main(int argc, char *argv[])
}
}
}
if (restart && !terminate)
daemon_sleep(restart, 0);
if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) {
warn("sigprocmask");
goto exit;
}
if (restart && !terminate) {
daemon_sleep(restart, 0);
close(pfd[0]);
pfd[0] = -1;
goto restart;
@ -384,7 +385,8 @@ static void
daemon_sleep(time_t secs, long nsecs)
{
struct timespec ts = { secs, nsecs };
while (nanosleep(&ts, &ts) == -1) {
while (!terminate && nanosleep(&ts, &ts) == -1) {
if (errno != EINTR)
err(1, "nanosleep");
}