X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=log%2Flogd.c;h=0175a5cc3bf07e0671b096a8ee409b2204e612e5;hp=3f8045912f1a6d88b844005ceaa58a81ba4d2656;hb=e66233771c93b4ef712cb7b2c954d44edf2228dc;hpb=6dccebd14b2216bd8631f54df0e690bffa53b77f diff --git a/log/logd.c b/log/logd.c index 3f80459..0175a5c 100644 --- a/log/logd.c +++ b/log/logd.c @@ -92,6 +92,9 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj, int ret; bool stream = true; + if (!stream) + count = 100; + if (msg) { blobmsg_parse(read_policy, __READ_MAX, tb, blob_data(msg), blob_len(msg)); if (tb[READ_LINES]) @@ -99,8 +102,6 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj, if (tb[READ_STREAM]) stream = blobmsg_get_bool(tb[READ_STREAM]); } - if (!stream) - count = 100; if (pipe(fds) == -1) { fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno)); @@ -225,6 +226,7 @@ main(int argc, char **argv) uloop_run(); log_shutdown(); uloop_done(); + ubus_auto_shutdown(&conn); return 0; }