logd: put non-streamed log entries into one result message

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

diff --git a/log/logd.c b/log/logd.c
index a9fec9a..d778909 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -31,8 +31,16 @@ static struct blob_buf b;
 static struct ubus_auto_conn conn;
 static LIST_HEAD(clients);
 
-static const struct blobmsg_policy read_policy =
-       { .name = "lines", .type = BLOBMSG_TYPE_INT32 };
+enum {
+       READ_LINES,
+       READ_STREAM,
+       __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 },
+};
 
 static const struct blobmsg_policy write_policy =
        { .name = "event", .type = BLOBMSG_TYPE_STRING };
@@ -55,14 +63,19 @@ client_close(struct ustream *s)
        free(cl);
 }
 
-static void
-client_notify_write(struct ustream *s, int bytes)
+static void client_notify_state(struct ustream *s)
 {
+       client_close(s);
 }
 
-static void client_notify_state(struct ustream *s)
+static void
+log_fill_msg(struct blob_buf *b, struct log_head *l)
 {
-       client_close(s);
+       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);
 }
 
 static int
@@ -71,37 +84,59 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct client *cl;
-       struct blob_attr *tb;
+       struct blob_attr *tb[__READ_MAX];
        struct log_head *l;
        int count = 0;
        int fds[2];
+       int ret;
+       bool stream = true;
+       void *c, *e;
+
+       if (!stream)
+               count = 100;
 
        if (msg) {
-               blobmsg_parse(&read_policy, 1, &tb, blob_data(msg), blob_len(msg));
-               if (tb)
-                       count = blobmsg_get_u32(tb);
+               blobmsg_parse(read_policy, __READ_MAX, tb, blob_data(msg), blob_len(msg));
+               if (tb[READ_LINES])
+                       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;
        }
 
-       pipe(fds);
-       ubus_request_set_fd(ctx, req, fds[0]);
-       cl = calloc(1, sizeof(*cl));
-       cl->s.stream.notify_write = client_notify_write;
-       cl->s.stream.notify_state = client_notify_state;
-       cl->fd = fds[1];
-       ustream_fd_init(&cl->s, cl->fd);
-       list_add(&cl->list, &clients);
        l = log_list(count, NULL);
-       while ((!tb || count) && l) {
+       if (stream) {
+               ubus_request_set_fd(ctx, req, fds[0]);
+               cl = calloc(1, sizeof(*cl));
+               cl->s.stream.notify_state = client_notify_state;
+               cl->fd = fds[1];
+               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;
+               }
+       } else {
                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);
-               l = log_list(count, l);
-               if (ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false) <= 0)
-                       break;
+               c = blobmsg_open_array(&b, "log");
+               while ((!tb[READ_LINES] || count) && l) {
+                       e = blobmsg_open_table(&b, NULL);
+                       log_fill_msg(&b, l);
+                       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;
 }
 
@@ -125,7 +160,7 @@ write_log(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static const struct ubus_method log_methods[] = {
-       { .name = "read", .handler = read_log, .policy = &read_policy, .n_policy = 1 },
+       UBUS_METHOD("read", read_log, read_policy),
        { .name = "write", .handler = write_log, .policy = &write_policy, .n_policy = 1 },
 };
 
@@ -147,15 +182,17 @@ ubus_notify_log(struct log_head *l)
        if (list_empty(&clients))
                return;
 
-       list_for_each_entry(c, &clients, list) {
-               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", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
+       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", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
+
+       list_for_each_entry(c, &clients, list)
                ustream_write(&c->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
-       }
+
+       blob_buf_free(&b);
 }
 
 static void
@@ -195,6 +232,7 @@ main(int argc, char **argv)
        uloop_run();
        log_shutdown();
        uloop_done();
+       ubus_auto_shutdown(&conn);
 
        return 0;
 }