From c59b9e1483ca50290f865737877358978d88dfc7 Mon Sep 17 00:00:00 2001
From: Jaroslav Suchanek <jsuchane@redhat.com>
Date: Tue, 28 Jun 2016 13:05:30 +0200
Subject: [PATCH] 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
---
 src/locking/lock_daemon.c | 12 ++++++------
 src/logging/log_daemon.c  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 2c45349acd..9509e0c6eb 100644
--- 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 8f1ccc22c5..9f71ca93b5 100644
--- 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:
-- 
GitLab