try to grab log data more aggressively

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 02fd9ff..bed0edd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -23,14 +23,6 @@ static struct list_head fds = LIST_HEAD_INIT(fds);
 
 #define DEFAULT_LOG_LEVEL L_NOTICE
 
-enum {
-       L_CRIT,
-       L_WARNING,
-       L_NOTICE,
-       L_INFO,
-       L_DEBUG
-};
-
 static int log_level = DEFAULT_LOG_LEVEL;
 static const int log_class[] = {
        [L_CRIT] = LOG_CRIT,
@@ -54,6 +46,10 @@ netifd_delete_process(struct netifd_process *proc)
                uloop_process_delete(&proc->uloop);
        list_del(&proc->list);
        netifd_fd_delete(&proc->log_fd);
+       if (proc->log_buf) {
+               free(proc->log_buf);
+               proc->log_buf = NULL;
+       }
 }
 
 void
@@ -85,26 +81,27 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
        if (!proc->log_buf)
                proc->log_buf = malloc(LOG_BUF_SIZE + 1);
 
-       buf = proc->log_buf + proc->log_buf_ofs;
-       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
        log_prefix = proc->log_prefix;
        if (!log_prefix)
                log_prefix = "process";
 
 retry:
+       buf = proc->log_buf + proc->log_buf_ofs;
+       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
        read_len = len = read(fd->fd, buf, maxlen);
-       if (len <= 0) {
-               if (errno == EINTR)
+       if (len < 0) {
+               if (errno == EAGAIN)
                        goto retry;
 
-               return;
-       }
+               goto out;
+       } else if (len == 0)
+               goto out;
+
        proc->log_buf_ofs += len;
 
        cur = buf;
        buf = proc->log_buf;
-       while ((cur = memchr(cur, '\n', len))) {
+       while (len > 0 && (cur = memchr(cur, '\n', len))) {
                *cur = 0;
 
                if (!proc->log_overflow)
@@ -132,8 +129,12 @@ retry:
        }
        proc->log_buf_ofs = len;
 
-       if (read_len == maxlen)
+       if (read_len > 0)
                goto retry;
+
+out:
+       if (fd->eof)
+               uloop_fd_delete(fd);
 }
 
 static void
@@ -198,6 +199,7 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
        uloop_process_add(&proc->uloop);
        list_add_tail(&proc->list, &process_list);
 
+       proc->log_buf_ofs = 0;
        proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
        proc->log_uloop.cb = netifd_process_log_cb;
        netifd_fd_add(&proc->log_fd);
@@ -240,7 +242,7 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 
 static void netifd_do_reload(struct uloop_timeout *timeout)
 {
-       config_init_interfaces(NULL);
+       config_init_all();
 }
 
 static struct uloop_timeout main_timer;
@@ -360,7 +362,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       config_init_interfaces(NULL);
+       config_init_all();
 
        uloop_run();
        netifd_kill_processes();