logread: fix reconnect logd logic

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

diff --git a/log/logd.c b/log/logd.c
index 58a1dec..18788fe 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -34,12 +34,14 @@ static LIST_HEAD(clients);
 enum {
        READ_LINES,
        READ_STREAM,
+       READ_ONESHOT,
        __READ_MAX
 };
 
 static const struct blobmsg_policy read_policy[__READ_MAX] = {
        [READ_LINES] = { .name = "lines", .type = BLOBMSG_TYPE_INT32 },
        [READ_STREAM] = { .name = "stream", .type = BLOBMSG_TYPE_BOOL },
+       [READ_ONESHOT] = { .name = "oneshot", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static const struct blobmsg_policy write_policy =
@@ -68,15 +70,22 @@ static void client_notify_state(struct ustream *s)
        client_close(s);
 }
 
+static void client_notify_write(struct ustream *s, int bytes)
+{
+       if (ustream_pending_data(s, true))
+               return;
+
+       client_close(s);
+}
+
 static void
 log_fill_msg(struct blob_buf *b, struct log_head *l)
 {
-       blob_buf_init(b, 0);
        blobmsg_add_string(b, "msg", l->data);
        blobmsg_add_u32(b, "id", l->id);
        blobmsg_add_u32(b, "priority", l->priority);
        blobmsg_add_u32(b, "source", l->source);
-       blobmsg_add_u64(b, "time", l->ts.tv_sec * 1000LL);
+       blobmsg_add_u64(b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
 }
 
 static int
@@ -85,12 +94,14 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct client *cl;
-       struct blob_attr *tb[__READ_MAX];
+       struct blob_attr *tb[__READ_MAX] = {};
        struct log_head *l;
        int count = 0;
        int fds[2];
        int ret;
        bool stream = true;
+       bool oneshot = false;
+       void *c, *e;
 
        if (!stream)
                count = 100;
@@ -101,15 +112,17 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                        count = blobmsg_get_u32(tb[READ_LINES]);
                if (tb[READ_STREAM])
                        stream = blobmsg_get_bool(tb[READ_STREAM]);
-       }
-
-       if (pipe(fds) == -1) {
-               fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
-               return -1;
+               if (tb[READ_ONESHOT])
+                       oneshot = blobmsg_get_bool(tb[READ_ONESHOT]);
        }
 
        l = log_list(count, NULL);
        if (stream) {
+               if (pipe(fds) == -1) {
+                       fprintf(stderr, "logd: failed to create pipe: %m\n");
+                       return -1;
+               }
+
                ubus_request_set_fd(ctx, req, fds[0]);
                cl = calloc(1, sizeof(*cl));
                cl->s.stream.notify_state = client_notify_state;
@@ -117,18 +130,29 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                ustream_fd_init(&cl->s, cl->fd);
                list_add(&cl->list, &clients);
                while ((!tb[READ_LINES] || count) && l) {
+                       blob_buf_init(&b, 0);
                        log_fill_msg(&b, l);
                        l = log_list(count, l);
                        ret = ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
                        if (ret < 0)
                                break;
                }
+
+               if (oneshot) {
+                       cl->s.stream.notify_write = client_notify_write;
+                       client_notify_write(&cl->s.stream, 0);
+               }
        } else {
+               blob_buf_init(&b, 0);
+               c = blobmsg_open_array(&b, "log");
                while ((!tb[READ_LINES] || count) && l) {
+                       e = blobmsg_open_table(&b, NULL);
                        log_fill_msg(&b, l);
-                       ubus_send_reply(ctx, req, b.head);
+                       blobmsg_close_table(&b, e);
                        l = log_list(count, l);
                }
+               blobmsg_close_array(&b, c);
+               ubus_send_reply(ctx, req, b.head);
        }
        blob_buf_free(&b);
        return 0;
@@ -143,10 +167,18 @@ write_log(struct ubus_context *ctx, struct ubus_object *obj,
        char *event;
 
        if (msg) {
+               int len;
+
                blobmsg_parse(&write_policy, 1, &tb, blob_data(msg), blob_len(msg));
                if (tb) {
                        event = blobmsg_get_string(tb);
-                       log_add(event, strlen(event) + 1, SOURCE_SYSLOG);
+                       len = strlen(event) + 1;
+                       if (len > LOG_LINE_SIZE) {
+                               len = LOG_LINE_SIZE;
+                               event[len - 1] = 0;
+                       }
+
+                       log_add(event, len, SOURCE_SYSLOG);
                }
        }
 
@@ -226,6 +258,7 @@ main(int argc, char **argv)
        uloop_run();
        log_shutdown();
        uloop_done();
+       ubus_auto_shutdown(&conn);
 
        return 0;
 }