]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: set up TLS log buffer after forking
authorDavid Lamparter <equinox@diac24.net>
Wed, 10 Jun 2020 18:30:02 +0000 (20:30 +0200)
committerDavid Lamparter <equinox@diac24.net>
Wed, 10 Jun 2020 18:38:02 +0000 (20:38 +0200)
... it contains our pid, so doing it before fork leads to littering
buffers since we try to clean up with the forked pid...

Fixes: #6541
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/libfrr.c

index ac165f254ef646cf44e87715930692467ccc7e3d..4f33ac70e863c3ae35a4da23a8bc374b555ad126 100644 (file)
@@ -661,7 +661,6 @@ struct thread_master *frr_init(void)
 
        zlog_init(di->progname, di->logname, di->instance,
                  ids.uid_normal, ids.gid_normal);
-       zlog_tls_buffer_init();
 
        command_setup_early_logging(di->early_logging, di->early_loglevel);
 
@@ -936,6 +935,7 @@ void frr_config_fork(void)
        if (!di->pid_file)
                di->pid_file = pidfile_default;
        pid_output(di->pid_file);
+       zlog_tls_buffer_init();
 }
 
 static void frr_vty_serv(void)