From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 6 Nov 2017 10:28:33 +0000 (+0100)
Subject: logread: use oneshot mode without -f, wait for logd to close
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=commitdiff_plain;h=4a10d4e02897be37a517bc6e016e9d722086765e

logread: use oneshot mode without -f, wait for logd to close

Fixes a race condition in dealing with larger amounts of log data

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

diff --git a/log/logread.c b/log/logread.c
index 994c88b..0cae75b 100644
--- a/log/logread.c
+++ b/log/logread.c
@@ -236,8 +236,6 @@ static void logread_fd_data_cb(struct ustream *s, int bytes)
 		log_notify(a);
 		ustream_consume(s, cur_len);
 	}
-	if (!log_follow)
-		uloop_end();
 }
 
 static void logread_fd_state_cb(struct ustream *s)
@@ -337,6 +335,7 @@ int main(int argc, char **argv)
 
 		blob_buf_init(&b, 0);
 		blobmsg_add_u8(&b, "stream", 1);
+		blobmsg_add_u8(&b, "oneshot", !log_follow);
 		if (lines)
 			blobmsg_add_u32(&b, "lines", lines);
 		else if (log_follow)