X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=log%2Flogread.c;h=784d1f9373e06d5e96c4857d2527253123e0396f;hp=28c9462904e69e07ae1649fa6ae9658567d320b6;hb=a0819044b14ec34450d2fcab33fb15232e8164fa;hpb=12728c38621c6271dd2102d3e11cf95ff42eeff8 diff --git a/log/logread.c b/log/logread.c index 28c9462..784d1f9 100644 --- a/log/logread.c +++ b/log/logread.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -57,9 +58,11 @@ static const struct blobmsg_policy log_policy[] = { static struct uloop_timeout retry; static struct uloop_fd sender; -static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname; +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 = 0; +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; @@ -79,7 +82,7 @@ static void log_handle_reconnect(struct uloop_timeout *timeout) uloop_timeout_set(&retry, 1000); } else { uloop_fd_add(&sender, ULOOP_READ); - syslog(0, "Logread connected to %s:%s\n", log_ip, log_port); + syslog(LOG_INFO, "Logread connected to %s:%s\n", log_ip, log_port); } } @@ -97,11 +100,13 @@ 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; if (sender.fd < 0) return 0; @@ -127,31 +132,49 @@ static int log_notify(struct blob_attr *msg) } m = blobmsg_get_string(tb[LOG_MSG]); + if (regexp_pattern && + 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; - *buf = '\0'; - if (hostname) - snprintf(buf, sizeof(buf), "%s ", hostname); + 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); + } if (log_prefix) { - strncat(buf, log_prefix, sizeof(buf)); - strncat(buf, ": ", sizeof(buf)); + strncat(buf, log_prefix, sizeof(buf) - strlen(buf) - 1); + strncat(buf, ": ", sizeof(buf) - strlen(buf) - 1); } if (blobmsg_get_u32(tb[LOG_SOURCE]) == SOURCE_KLOG) - strncat(buf, "kernel: ", sizeof(buf)); - strncat(buf, m, sizeof(buf)); + strncat(buf, "kernel: ", sizeof(buf) - strlen(buf) - 1); + strncat(buf, m, sizeof(buf) - strlen(buf) - 1); if (log_udp) err = write(sender.fd, buf, strlen(buf)); - else - err = send(sender.fd, buf, strlen(buf), 0); + else { + size_t buflen = strlen(buf); + if (!log_trailer_null) + buf[buflen] = '\n'; + err = send(sender.fd, buf, buflen + 1, 0); + } if (err < 0) { - syslog(0, "failed to send log data to %s:%s via %s\n", + syslog(LOG_INFO, "failed to send log data to %s:%s via %s\n", log_ip, log_port, (log_udp) ? ("udp") : ("tcp")); uloop_fd_delete(&sender); close(sender.fd); @@ -159,17 +182,18 @@ 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); - write(sender.fd, buf, strlen(buf)); + ret = write(sender.fd, buf, strlen(buf)); } - free(str); if (log_type == LOG_FILE) fsync(sender.fd); - return 0; + return ret; } static int usage(const char *prog) @@ -178,6 +202,7 @@ static int usage(const char *prog) "Options:\n" " -s Path to ubus socket\n" " -l Got only the last 'count' messages\n" + " -e Filter messages with a regexp\n" " -r Stream message to a server\n" " -F Log file\n" " -S Log size\n" @@ -186,6 +211,8 @@ static int usage(const char *prog) " -P 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; } @@ -193,17 +220,25 @@ static int usage(const char *prog) static void logread_fd_data_cb(struct ustream *s, int bytes) { while (true) { - int len; struct blob_attr *a; + int len, cur_len; a = (void*) ustream_get_read_buf(s, &len); - if (len < sizeof(*a) || len < blob_len(a) + sizeof(*a)) + if (len < sizeof(*a)) break; + + cur_len = blob_len(a) + sizeof(*a); + if (len < cur_len) + break; + log_notify(a); - ustream_consume(s, blob_len(a) + sizeof(*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) @@ -211,13 +246,10 @@ 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); } -static void logread_complete_cb(struct ubus_request *req, int ret) -{ -} - int main(int argc, char **argv) { static struct ubus_request req; @@ -230,11 +262,14 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); - while ((ch = getopt(argc, argv, "ufcs:l:r:F:p:S:P:h:")) != -1) { + while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:t")) != -1) { switch (ch) { case 'u': log_udp = 1; break; + case '0': + log_trailer_null = 1; + break; case 's': ubus_socket = optarg; break; @@ -266,6 +301,14 @@ int main(int argc, char **argv) case 'h': hostname = optarg; break; + case 'e': + if (!regcomp(®exp_preg, optarg, REG_NOSUB)) { + regexp_pattern = optarg; + } + break; + case 't': + log_timestamp = 1; + break; default: return usage(*argv); } @@ -289,6 +332,8 @@ 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) @@ -322,7 +367,6 @@ int main(int argc, char **argv) ubus_invoke_async(ctx, id, "read", b.head, &req); req.fd_cb = logread_fd_cb; - req.complete_cb = logread_complete_cb; ubus_complete_request_async(ctx, &req); uloop_run();