logging: fixing log level initialization from cmdline

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

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 2c45349acdbd71b4da1906b57721e1072f6680bd..9509e0c6ebce70305bc1f591df83ab893b242c61 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -481,6 +481,12 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr 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
@@ -541,12 +547,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config,
         VIR_FREE(tmp);
     }
 
-    /*
-     * Command line override for --verbose
-     */
-    if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
-        virLogSetDefaultPriority(VIR_LOG_INFO);
-
     return 0;
 
  error:

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 8f1ccc22c5992cc9cb8212cce89fbd1447f80a45..9f71ca93b51b434235a6852f2926c9e4a6c33997 100644 (file)
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -404,6 +404,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr 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
@@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config,
         VIR_FREE(tmp);
     }
 
-    /*
-     * Command line override for --verbose
-     */
-    if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
-        virLogSetDefaultPriority(VIR_LOG_INFO);
-
     return 0;
 
  error: