External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging: fixing log level initialization from cmdline

Browse Source 
Reorder code for setting default log level from cmdline prior
initialization of log outputs. Thus the --verbose option is reflected.

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325072
This commit is contained in:
Jaroslav Suchanek 2016-06-28 13:05:30 +02:00 committed by Erik Skultety
parent fa3c558596
commit c59b9e1483
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/locking/lock_daemon.c
View File

@ -481,6 +481,12 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config,
if (virLogGetNbOutputs() == 0) if (virLogGetNbOutputs() == 0)
virLogParseOutputs(config->log_outputs); 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 * If no defined outputs, and either running
* as daemon or not on a tty, then first try * as daemon or not on a tty, then first try
@ -541,12 +547,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config,
VIR_FREE(tmp); VIR_FREE(tmp);
} }
/*
* Command line override for --verbose
*/
if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
virLogSetDefaultPriority(VIR_LOG_INFO);
return 0; return 0;
error: error:

12
src/logging/log_daemon.c
View File

@ -404,6 +404,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config,
if (virLogGetNbOutputs() == 0) if (virLogGetNbOutputs() == 0)
virLogParseOutputs(config->log_outputs); 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 * If no defined outputs, and either running
* as daemon or not on a tty, then first try * as daemon or not on a tty, then first try
@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config,
VIR_FREE(tmp); VIR_FREE(tmp);
} }
/*
* Command line override for --verbose
*/
if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
virLogSetDefaultPriority(VIR_LOG_INFO);
return 0; return 0;
error: error: