logread: fix reconnect logd logic

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

diff --git a/log/logread.c b/log/logread.c
index 0cae75b..e47541a 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -33,6 +33,8 @@
 #include "libubus.h"
 #include "syslog.h"
 
+#define LOGD_CONNECT_RETRY     10
+
 enum {
        LOG_STDOUT,
        LOG_FILE,
@@ -63,6 +65,7 @@ static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostna
 static int log_type = LOG_STDOUT;
 static int log_size, log_udp, log_follow, log_trailer_null = 0;
 static int log_timestamp;
+static int logd_conn_tries = LOGD_CONNECT_RETRY;
 
 static const char* getcodetext(int value, CODE *codetable) {
        CODE *i;
@@ -78,7 +81,7 @@ static void log_handle_reconnect(struct uloop_timeout *timeout)
 {
        sender.fd = usock((log_udp) ? (USOCK_UDP) : (USOCK_TCP), log_ip, log_port);
        if (sender.fd < 0) {
-               fprintf(stderr, "failed to connect: %s\n", strerror(errno));
+               fprintf(stderr, "failed to connect: %m\n");
                uloop_timeout_set(&retry, 1000);
        } else {
                uloop_fd_add(&sender, ULOOP_READ);
@@ -100,10 +103,9 @@ 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;
@@ -127,7 +129,7 @@ static int log_notify(struct blob_attr *msg)
                }
                sender.fd = open(log_file, O_CREAT | O_WRONLY | O_APPEND, 0600);
                if (sender.fd < 0) {
-                       fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
+                       fprintf(stderr, "failed to open %s: %m\n", log_file);
                        exit(-1);
                }
        }
@@ -145,7 +147,7 @@ static int log_notify(struct blob_attr *msg)
        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;
 
@@ -191,7 +193,6 @@ static int log_notify(struct blob_attr *msg)
                ret = write(sender.fd, buf, strlen(buf));
        }
 
-       free(str);
        if (log_type == LOG_FILE)
                fsync(sender.fd);
 
@@ -240,6 +241,8 @@ static void logread_fd_data_cb(struct ustream *s, int bytes)
 
 static void logread_fd_state_cb(struct ustream *s)
 {
+       if (log_follow)
+               logd_conn_tries = LOGD_CONNECT_RETRY;
        uloop_end();
 }
 
@@ -247,20 +250,43 @@ static void logread_fd_cb(struct ubus_request *req, int fd)
 {
        static struct ustream_fd test_fd;
 
+       memset(&test_fd, 0, sizeof(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);
 }
 
+static void logread_setup_output(void)
+{
+       if (sender.fd || sender.cb)
+               return;
+
+       if (log_ip && log_port) {
+               openlog("logread", LOG_PID, LOG_DAEMON);
+               log_type = LOG_NET;
+               sender.cb = log_handle_fd;
+               retry.cb = log_handle_reconnect;
+               uloop_timeout_set(&retry, 1000);
+       } else if (log_file) {
+               log_type = LOG_FILE;
+               sender.fd = open(log_file, O_CREAT | O_WRONLY| O_APPEND, 0600);
+               if (sender.fd < 0) {
+                       fprintf(stderr, "failed to open %s: %m\n", log_file);
+                       exit(-1);
+               }
+       } else {
+               sender.fd = STDOUT_FILENO;
+       }
+}
+
 int main(int argc, char **argv)
 {
-       static struct ubus_request req;
        struct ubus_context *ctx;
        uint32_t id;
        const char *ubus_socket = NULL;
        int ch, ret, lines = 0;
        static struct blob_buf b;
-       int tries = 5;
 
        signal(SIGPIPE, SIG_IGN);
 
@@ -324,58 +350,48 @@ int main(int argc, char **argv)
        }
        ubus_add_uloop(ctx);
 
+       if (log_follow && pid_file) {
+               FILE *fp = fopen(pid_file, "w+");
+               if (fp) {
+                       fprintf(fp, "%d", getpid());
+                       fclose(fp);
+               }
+       }
+
+       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)
+               blobmsg_add_u32(&b, "lines", 0);
+
        /* ugly ugly ugly ... we need a real reconnect logic */
        do {
+               struct ubus_request req = { 0 };
+
                ret = ubus_lookup_id(ctx, "log", &id);
                if (ret) {
                        fprintf(stderr, "Failed to find log object: %s\n", ubus_strerror(ret));
                        sleep(1);
                        continue;
                }
-
-               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)
-                       blobmsg_add_u32(&b, "lines", 0);
-               if (log_follow) {
-                       if (pid_file) {
-                               FILE *fp = fopen(pid_file, "w+");
-                               if (fp) {
-                                       fprintf(fp, "%d", getpid());
-                                       fclose(fp);
-                               }
-                       }
-               }
-
-               if (log_ip && log_port) {
-                       openlog("logread", LOG_PID, LOG_DAEMON);
-                       log_type = LOG_NET;
-                       sender.cb = log_handle_fd;
-                       retry.cb = log_handle_reconnect;
-                       uloop_timeout_set(&retry, 1000);
-               } else if (log_file) {
-                       log_type = LOG_FILE;
-                       sender.fd = open(log_file, O_CREAT | O_WRONLY| O_APPEND, 0600);
-                       if (sender.fd < 0) {
-                               fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
-                               exit(-1);
-                       }
-               } else {
-                       sender.fd = STDOUT_FILENO;
-               }
+               logd_conn_tries = 0;
+               logread_setup_output();
 
                ubus_invoke_async(ctx, id, "read", b.head, &req);
                req.fd_cb = logread_fd_cb;
                ubus_complete_request_async(ctx, &req);
 
                uloop_run();
-               ubus_free(ctx);
-               uloop_done();
 
-       } while (ret && tries--);
+       } while (logd_conn_tries--);
+
+       ubus_free(ctx);
+       uloop_done();
+
+       if (log_follow && pid_file)
+               unlink(pid_file);
 
        return ret;
 }