From e7323e515ad33191f779197e8b14d8d1c2ad531d Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Wed, 19 Jun 2024 21:25:30 +0200 Subject: conf, passt: Don't call __openlog() if a log file is used If a log file is configured, we would otherwise open a connection to the system logger (if any), print any message that we might have before we initialise the log file, and then keep that connection around for no particular reason. Call __openlog() as an alternative to the log file setup, instead. This way, we might skip printing some messages during the initialisation phase, but they're probably not really valuable to have in a system log, and we're going to print them to standard error anyway. Suggested-by: David Gibson Signed-off-by: Stefano Brivio Reviewed-by: David Gibson --- conf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index 3db8d4d..e1f5422 100644 --- a/conf.c +++ b/conf.c @@ -1217,6 +1217,7 @@ void conf(struct ctx *c, int argc, char **argv) {"netns-only", no_argument, NULL, 20 }, { 0 }, }; + const char *logname = (c->mode == MODE_PASTA) ? "pasta" : "passt"; char userns[PATH_MAX] = { 0 }, netns[PATH_MAX] = { 0 }; bool copy_addrs_opt = false, copy_routes_opt = false; struct in6_addr *dns6 = c->ip6.dns, dns6_tmp; @@ -1619,10 +1620,10 @@ void conf(struct ctx *c, int argc, char **argv) conf_ugid(runas, &uid, &gid); - if (logfile) { - logfile_init(c->mode == MODE_PASTA ? "pasta" : "passt", - logfile, logsize); - } + if (logfile) + logfile_init(logname, logfile, logsize); + else + __openlog(logname, 0, LOG_DAEMON); if (c->debug) __setlogmask(LOG_UPTO(LOG_DEBUG)); -- cgit v1.2.3