From 9eac73eb846ae5d4d9c44f80cf8de607c113bd72 Mon Sep 17 00:00:00 2001 From: Zhou Yimin Date: Mon, 25 Aug 2014 20:18:01 +0800 Subject: [PATCH] daemon: Fix option -v missing info priority log Introduce by 63fbcc692. When start libvirtd with commandline "/usr/sbin/libvirtd -d -l -v", we expect verbose(info level) log if neither environment variable nor config file about logging controls is set. But in fact we can't get any info priority log in the default output file. The log priority of default output is VIR_LOG_DEFAULT(VIR_LOG_WARN), so the info log is filtered out. To record info priority log we must parse option -v before setting the default output. After this patch, we get all verbose log in the default output file. Signed-off-by: Zhou Yimin --- daemon/libvirtd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4cf78e6d8..87af9038f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -682,6 +682,12 @@ daemonSetupLogging(struct daemonConfig *config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); + /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try @@ -748,12 +754,6 @@ daemonSetupLogging(struct daemonConfig *config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 2.39.5