From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 29 Sep 2021 12:45:16 +0000 (+0200)
Subject: main: poll process log stream even if processes are killed
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=62e2bb56f48ec9aa66a0ffb9a0169e1a755965fb;p=project%2Fnetifd.git

main: poll process log stream even if processes are killed

Ensures that pending log messages are still received

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/main.c b/main.c
index 804424e..0fb72b3 100644
--- a/main.c
+++ b/main.c
@@ -57,6 +57,7 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
+	while (ustream_poll(&proc->log.stream));
 	list_del(&proc->list);
 	ustream_free(&proc->log.stream);
 	close(proc->log.fd.fd);
@@ -127,7 +128,6 @@ netifd_process_cb(struct uloop_process *proc, int ret)
 	struct netifd_process *np;
 	np = container_of(proc, struct netifd_process, uloop);
 
-	while (ustream_poll(&np->log.stream));
 	netifd_delete_process(np);
 	return np->cb(np, ret);
 }