X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=log%2Flogread.c;h=c4ab4290c4830ef33abb380914bd468e8ec4ec7a;hp=676bb82b18be886a3cf14a66db197ae9c7b1a0f2;hb=b81bea73b627e1f9cf75f1556634856280a2a89b;hpb=6dccebd14b2216bd8631f54df0e690bffa53b77f

diff --git a/log/logread.c b/log/logread.c
index 676bb82..c4ab429 100644
--- a/log/logread.c
+++ b/log/logread.c
@@ -62,6 +62,7 @@ static regex_t regexp_preg;
 static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname, *regexp_pattern;
 static int log_type = LOG_STDOUT;
 static int log_size, log_udp, log_follow, log_trailer_null = 0;
+static int log_timestamp;
 
 static const char* getcodetext(int value, CODE *codetable) {
 	CODE *i;
@@ -77,7 +78,7 @@ static void log_handle_reconnect(struct uloop_timeout *timeout)
 {
 	sender.fd = usock((log_udp) ? (USOCK_UDP) : (USOCK_TCP), log_ip, log_port);
 	if (sender.fd < 0) {
-		fprintf(stderr, "failed to connect: %s\n", strerror(errno));
+		fprintf(stderr, "failed to connect: %m\n");
 		uloop_timeout_set(&retry, 1000);
 	} else {
 		uloop_fd_add(&sender, ULOOP_READ);
@@ -99,10 +100,11 @@ static int log_notify(struct blob_attr *msg)
 {
 	struct blob_attr *tb[__LOG_MAX];
 	struct stat s;
-	char buf[512];
+	char buf[LOG_LINE_SIZE + 128];
+	char buf_ts[32];
 	uint32_t p;
-	char *str;
 	time_t t;
+	uint32_t t_ms = 0;
 	char *c, *m;
 	int ret = 0;
 
@@ -124,7 +126,7 @@ static int log_notify(struct blob_attr *msg)
 		}
 		sender.fd = open(log_file, O_CREAT | O_WRONLY | O_APPEND, 0600);
 		if (sender.fd < 0) {
-			fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
+			fprintf(stderr, "failed to open %s: %m\n", log_file);
 			exit(-1);
 		}
 	}
@@ -134,15 +136,23 @@ static int log_notify(struct blob_attr *msg)
 	    regexec(&regexp_preg, m, 0, NULL, 0) == REG_NOMATCH)
 		return 0;
 	t = blobmsg_get_u64(tb[LOG_TIME]) / 1000;
+	if (log_timestamp) {
+		t_ms = blobmsg_get_u64(tb[LOG_TIME]) % 1000;
+		snprintf(buf_ts, sizeof(buf_ts), "[%lu.%03u] ",
+				(unsigned long)t, t_ms);
+	}
 	c = ctime(&t);
 	p = blobmsg_get_u32(tb[LOG_PRIO]);
 	c[strlen(c) - 1] = '\0';
-	str = blobmsg_format_json(msg, true);
+
 	if (log_type == LOG_NET) {
 		int err;
 
 		snprintf(buf, sizeof(buf), "<%u>", p);
 		strncat(buf, c + 4, 16);
+		if (log_timestamp) {
+			strncat(buf, buf_ts, sizeof(buf) - strlen(buf) - 1);
+		}
 		if (hostname) {
 			strncat(buf, hostname, sizeof(buf) - strlen(buf) - 1);
 			strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
@@ -172,13 +182,14 @@ static int log_notify(struct blob_attr *msg)
 			uloop_timeout_set(&retry, 1000);
 		}
 	} else {
-		snprintf(buf, sizeof(buf), "%s %s.%s%s %s\n",
-			c, getcodetext(LOG_FAC(p) << 3, facilitynames), getcodetext(LOG_PRI(p), prioritynames),
+		snprintf(buf, sizeof(buf), "%s %s%s.%s%s %s\n",
+			c, log_timestamp ? buf_ts : "",
+			getcodetext(LOG_FAC(p) << 3, facilitynames),
+			getcodetext(LOG_PRI(p), prioritynames),
 			(blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"), m);
 		ret = write(sender.fd, buf, strlen(buf));
 	}
 
-	free(str);
 	if (log_type == LOG_FILE)
 		fsync(sender.fd);
 
@@ -200,6 +211,7 @@ static int usage(const char *prog)
 		"    -P	<prefix>	Prefix custom text to streamed messages\n"
 		"    -f			Follow log messages\n"
 		"    -u			Use UDP as the protocol\n"
+		"    -t			Add an extra timestamp\n"
 		"    -0			Use \\0 instead of \\n as trailer when using TCP\n"
 		"\n", prog);
 	return 1;
@@ -222,8 +234,11 @@ 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)
+{
+	uloop_end();
 }
 
 static void logread_fd_cb(struct ubus_request *req, int fd)
@@ -231,6 +246,7 @@ static void logread_fd_cb(struct ubus_request *req, int fd)
 	static struct ustream_fd test_fd;
 
 	test_fd.stream.notify_read = logread_fd_data_cb;
+	test_fd.stream.notify_state = logread_fd_state_cb;
 	ustream_fd_init(&test_fd, fd);
 }
 
@@ -246,7 +262,7 @@ int main(int argc, char **argv)
 
 	signal(SIGPIPE, SIG_IGN);
 
-	while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:")) != -1) {
+	while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:t")) != -1) {
 		switch (ch) {
 		case 'u':
 			log_udp = 1;
@@ -290,6 +306,9 @@ int main(int argc, char **argv)
 				regexp_pattern = optarg;
 			}
 			break;
+		case 't':
+			log_timestamp = 1;
+			break;
 		default:
 			return usage(*argv);
 		}
@@ -303,6 +322,14 @@ int main(int argc, char **argv)
 	}
 	ubus_add_uloop(ctx);
 
+	if (log_follow && pid_file) {
+		FILE *fp = fopen(pid_file, "w+");
+		if (fp) {
+			fprintf(fp, "%d", getpid());
+			fclose(fp);
+		}
+	}
+
 	/* ugly ugly ugly ... we need a real reconnect logic */
 	do {
 		ret = ubus_lookup_id(ctx, "log", &id);
@@ -314,19 +341,11 @@ 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)
 			blobmsg_add_u32(&b, "lines", 0);
-		if (log_follow) {
-			if (pid_file) {
-				FILE *fp = fopen(pid_file, "w+");
-				if (fp) {
-					fprintf(fp, "%d", getpid());
-					fclose(fp);
-				}
-			}
-		}
 
 		if (log_ip && log_port) {
 			openlog("logread", LOG_PID, LOG_DAEMON);
@@ -338,7 +357,7 @@ int main(int argc, char **argv)
 			log_type = LOG_FILE;
 			sender.fd = open(log_file, O_CREAT | O_WRONLY| O_APPEND, 0600);
 			if (sender.fd < 0) {
-				fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
+				fprintf(stderr, "failed to open %s: %m\n", log_file);
 				exit(-1);
 			}
 		} else {
@@ -355,5 +374,8 @@ int main(int argc, char **argv)
 
 	} while (ret && tries--);
 
+	if (log_follow && pid_file)
+		unlink(pid_file);
+
 	return ret;
 }