X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=log%2Flogread.c;h=e47541a19f5aaef724f1118a0ad26b7a0619d5ea;hp=a7ab567a9fa0bbd0f6c4b8072f7e35b9128d332c;hb=HEAD;hpb=5c45b560bc8c9e13682269ed963a8a4a65959518 diff --git a/log/logread.c b/log/logread.c index a7ab567..e47541a 100644 --- a/log/logread.c +++ b/log/logread.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,8 @@ #include "libubus.h" #include "syslog.h" +#define LOGD_CONNECT_RETRY 10 + enum { LOG_STDOUT, LOG_FILE, @@ -57,9 +60,12 @@ 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 int logd_conn_tries = LOGD_CONNECT_RETRY; static const char* getcodetext(int value, CODE *codetable) { CODE *i; @@ -75,11 +81,11 @@ 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); - 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 +103,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; @@ -121,40 +129,55 @@ 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); } } 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; 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)); - strncat(buf, " ", sizeof(buf)); + 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); @@ -162,17 +185,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) @@ -181,6 +205,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" @@ -189,6 +214,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; } @@ -196,48 +223,81 @@ 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) +{ + if (log_follow) + logd_conn_tries = LOGD_CONNECT_RETRY; + uloop_end(); } static void logread_fd_cb(struct ubus_request *req, int fd) { static struct ustream_fd test_fd; + memset(&test_fd, 0, sizeof(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) +static void logread_setup_output(void) { + if (sender.fd || sender.cb) + return; + + if (log_ip && log_port) { + openlog("logread", LOG_PID, LOG_DAEMON); + log_type = LOG_NET; + sender.cb = log_handle_fd; + retry.cb = log_handle_reconnect; + uloop_timeout_set(&retry, 1000); + } else if (log_file) { + 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: %m\n", log_file); + exit(-1); + } + } else { + sender.fd = STDOUT_FILENO; + } } int main(int argc, char **argv) { - static struct ubus_request req; struct ubus_context *ctx; uint32_t id; const char *ubus_socket = NULL; int ch, ret, lines = 0; static struct blob_buf b; - int tries = 5; 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; @@ -269,6 +329,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); } @@ -282,57 +350,48 @@ 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); + } + } + + 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); + /* ugly ugly ugly ... we need a real reconnect logic */ do { + struct ubus_request req = { 0 }; + ret = ubus_lookup_id(ctx, "log", &id); if (ret) { fprintf(stderr, "Failed to find log object: %s\n", ubus_strerror(ret)); sleep(1); continue; } - - blob_buf_init(&b, 0); - 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); - log_type = LOG_NET; - sender.cb = log_handle_fd; - retry.cb = log_handle_reconnect; - uloop_timeout_set(&retry, 1000); - } else if (log_file) { - 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)); - exit(-1); - } - } else { - sender.fd = STDOUT_FILENO; - } + logd_conn_tries = 0; + logread_setup_output(); 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(); - ubus_free(ctx); - uloop_done(); - } while (ret && tries--); + } while (logd_conn_tries--); + + ubus_free(ctx); + uloop_done(); + + if (log_follow && pid_file) + unlink(pid_file); return ret; }