logrea: move the code setting up the request blob out of the main loop

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

diff --git a/log/logread.c b/log/logread.c
index c4ab429..fa24132 100644 (file)
--- a/log/logread.c
+++ b/log/logread.c
@@ -250,6 +250,29 @@ static void logread_fd_cb(struct ubus_request *req, int fd)
        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;
@@ -330,6 +353,14 @@ int main(int argc, char **argv)
                }
        }
 
+       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 {
                ret = ubus_lookup_id(ctx, "log", &id);
@@ -339,32 +370,9 @@ int main(int argc, char **argv)
                        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_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;
-               }
+               logread_setup_output();
 
-               ubus_invoke_async(ctx, id, "read", b.head, &req);
+                       ubus_invoke_async(ctx, id, "read", b.head, &req);
                req.fd_cb = logread_fd_cb;
                ubus_complete_request_async(ctx, &req);