wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-07 16:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix kill() on timeout of pre:/post:/ready:scripts

Browse Source 
A long running pre/post/ready script must be killed properly, not by
targeting its process group.  Process group cleanup is handled by the
service_monitor() when reaping the script's PID.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2025-02-11 10:17:34 +01:00
1 parent 9d8a9b7fba
commit 990307fbc9
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+3 -2
View File
@@ -150,7 +150,7 @@ static void service_script_kill(svc_t *svc)
continue; continue;
dbg("Killing service %s script PID %d.", svc_ident(svc, NULL, 0), ptr->pid); dbg("Killing service %s script PID %d.", svc_ident(svc, NULL, 0), ptr->pid);
kill(-ptr->pid, SIGKILL); kill(ptr->pid, SIGKILL);
TAILQ_REMOVE(&svc_assoc_list, ptr, link); TAILQ_REMOVE(&svc_assoc_list, ptr, link);
free(ptr); free(ptr);
} }
@@ -2086,7 +2086,8 @@ static void service_kill_script(svc_t *svc)
if (svc->pid <= 1) if (svc->pid <= 1)
return; return;
kill(-svc->pid, SIGKILL); dbg("Timeout, killing service %s script PID %d", svc_ident(svc, NULL, 0), svc->pid);
kill(svc->pid, SIGKILL);
} }
/* /*