logread: fix line buffer size

[project/ubox.git] / log / logread.c

diff --git a/log/logread.c b/log/logread.c
index 6255408..784d1f9 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -17,6 +17,7 @@
 
 #include <fcntl.h>
 #include <time.h>
+#include <regex.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -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, log_trailer_null = 0;
+static int log_timestamp;
 
 static const char* getcodetext(int value, CODE *codetable) {
        CODE *i;
@@ -97,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;
 
@@ -128,16 +132,27 @@ static int log_notify(struct blob_attr *msg)
        }
 
        m = blobmsg_get_string(tb[LOG_MSG]);
+       if (regexp_pattern &&
+           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);
@@ -167,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);
 
@@ -186,6 +202,7 @@ static int usage(const char *prog)
                "Options:\n"
                "    -s <path>          Path to ubus socket\n"
                "    -l <count>         Got only the last 'count' messages\n"
+               "    -e <pattern>       Filter messages with a regexp\n"
                "    -r <server> <port> Stream message to a server\n"
                "    -F <file>          Log file\n"
                "    -S <bytes>         Log size\n"
@@ -194,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;
@@ -202,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)
@@ -220,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);
 }
 
@@ -235,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:")) != -1) {
+       while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:t")) != -1) {
                switch (ch) {
                case 'u':
                        log_udp = 1;
@@ -274,6 +301,14 @@ int main(int argc, char **argv)
                case 'h':
                        hostname = optarg;
                        break;
+               case 'e':
+                       if (!regcomp(&regexp_preg, optarg, REG_NOSUB)) {
+                               regexp_pattern = optarg;
+                       }
+                       break;
+               case 't':
+                       log_timestamp = 1;
+                       break;
                default:
                        return usage(*argv);
                }
@@ -297,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)