Check return value from kill(pid, SIGHUP), maybe lost pid

This patch handles a corner case when Finit may not have detected a
supervised process has died.  When a user calls `initctl restart foo`
we now send such lost PIDs to the service_monitor() for restart.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-02-24 23:58:25 +01:00
1 parent 6cdcacf20b
commit 477b50b7a6
1 file changed
+9 -1
+9 -1
View File
@@ -722,6 +722,7 @@ static int service_stop(svc_t *svc)
static int service_restart(svc_t *svc) static int service_restart(svc_t *svc)
{ {
int do_progress = 1; int do_progress = 1;
pid_t lost = 0;
int rc; int rc;
/* Ignore if finit is SIGSTOP'ed */ /* Ignore if finit is SIGSTOP'ed */
@@ -748,7 +749,10 @@ static int service_restart(svc_t *svc)
logit(LOG_CONSOLE | LOG_NOTICE, "Restarting %s[%d], sending SIGHUP ...", logit(LOG_CONSOLE | LOG_NOTICE, "Restarting %s[%d], sending SIGHUP ...",
svc_ident(svc, NULL, 0), svc->pid); svc_ident(svc, NULL, 0), svc->pid);
rc = kill(svc->pid, SIGHUP); rc = kill(svc->pid, SIGHUP);
if (rc == -1 && errno == ESRCH) {
/* nobody home, reset internal state machine */
lost = svc->pid;
} else {
/* Declare we're waiting for svc to re-assert/touch its pidfile */ /* Declare we're waiting for svc to re-assert/touch its pidfile */
svc_starting(svc); svc_starting(svc);
@@ -757,10 +761,14 @@ static int service_restart(svc_t *svc)
sched_yield(); sched_yield();
touch(pid_file(svc)); touch(pid_file(svc));
} }
}
if (do_progress) if (do_progress)
print_result(rc); print_result(rc);
if (lost)
service_monitor(lost, 0);
return rc; return rc;
} }