mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

subd: if a required daemon exits, wait instead of killing it.

Browse source 
Otherwise we always say it died because we killed it, so we don't get
the exit status.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-12-11 13:23:28 +10:30
parent 36746bf65a
commit b83ac58a98
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lightningd/subd.c
View file

@ -523,8 +523,13 @@ static void destroy_subd(struct subd *sd)
switch (waitpid(sd->pid, &status, WNOHANG)) { switch (waitpid(sd->pid, &status, WNOHANG)) {
case 0: case 0:
log_debug(sd->log, "Status closed, but not exited. Killing"); /* If it's an essential daemon, don't kill: we want the
* exit status */
if (!sd->must_not_exit) {
log_debug(sd->log,
"Status closed, but not exited. Killing");
kill(sd->pid, SIGKILL); kill(sd->pid, SIGKILL);
}
waitpid(sd->pid, &status, 0); waitpid(sd->pid, &status, 0);
fail_if_subd_fails = false; fail_if_subd_fails = false;
break; break;