aboutgitcodebugslistschat
path: root/conf.c
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2024-02-22 18:17:41 +0100
committerStefano Brivio <sbrivio@redhat.com>2024-02-27 14:08:33 +0100
commit15001b39ef1d41c0535ef0d2384e074c6f85cefd (patch)
tree52b5bdd578caf88a70fb5b196969f861b9771b01 /conf.c
parentb08716551afd5a3c78d674226d71a4bbcc05b3de (diff)
downloadpasst-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar.gz
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar.bz2
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar.lz
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar.xz
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.tar.zst
passt-15001b39ef1d41c0535ef0d2384e074c6f85cefd.zip
conf: set the log level much earlier
--quiet is supposed to silence the "No routable interface" message but it does not work because the log level was set long after conf_ip4/6() was called which means it uses the default level which logs everything. To address this move the log level logic directly after the option parsing in conf(). Signed-off-by: Paul Holzinger <pholzing@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/conf.c b/conf.c
index 9c99531..17cf279 100644
--- a/conf.c
+++ b/conf.c
@@ -1646,6 +1646,16 @@ void conf(struct ctx *c, int argc, char **argv)
logfile, logsize);
}
+ /* Once the log mask is not LOG_EARLY, we will no longer log to stderr
+ * if there was a log file specified.
+ */
+ if (c->debug)
+ __setlogmask(LOG_UPTO(LOG_DEBUG));
+ else if (c->quiet)
+ __setlogmask(LOG_UPTO(LOG_WARNING));
+ else
+ __setlogmask(LOG_UPTO(LOG_INFO));
+
nl_sock_init(c, false);
if (!v6_only)
c->ifi4 = conf_ip4(ifi4, &c->ip4, c->mac);