logread: fix reconnect logd logic

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

diff --git a/log/logd.c b/log/logd.c
index ee30984..18788fe 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -119,7 +119,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
        l = log_list(count, NULL);
        if (stream) {
                if (pipe(fds) == -1) {
-                       fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
+                       fprintf(stderr, "logd: failed to create pipe: %m\n");
                        return -1;
                }
 
@@ -167,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);
                }
        }