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;
struct blob_attr *tb[__LOG_MAX];
struct stat s;
char buf[512];
+ char buf_ts[32];
uint32_t p;
- char *str;
time_t t;
+ uint32_t t_ms = 0;
char *c, *m;
int ret = 0;
regexec(®exp_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);
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);
" -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;
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)
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);
}
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;
regexp_pattern = optarg;
}
break;
+ case 't':
+ log_timestamp = 1;
+ break;
default:
return usage(*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)