Fix logging initialization in daemon

diff --git a/ChangeLog b/ChangeLog
index 970e12409f3a0120cbed30d842a0a48e25ccd2cc..9cd271648f6e58e6fecf3121d53fc117db81d80c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  3 11:32:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/qemud.c: Honour LIBVIRT_LOG_FILTERS/OUTPUTS env variables
+       when initializing logging.
+
 Tue Jun  2 17:05:52 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
        * src/Makefile.am src/node_device.[ch] src/node_device_conf.[ch]

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 783dc69927eefe243dfa6674b426348d6e773b03..bd2ab72dbe4df8253fb53f2a6fab7e6bf3bba9b9 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2482,6 +2482,11 @@ qemudSetLogging(virConfPtr conf, const char *filename) {
 
     /* there is no default filters */
     GET_CONF_STR (conf, filename, log_filters);
+    if (!log_filters) {
+        debugEnv = getenv("LIBVIRT_LOG_FILTERS");
+        if (debugEnv)
+            log_filters = strdup(debugEnv);
+    }
     virLogParseFilters(log_filters);
 
     /*
@@ -2489,7 +2494,12 @@ qemudSetLogging(virConfPtr conf, const char *filename) {
      * all logs to stderr if not running as daemon
      */
     GET_CONF_STR (conf, filename, log_outputs);
-    if (log_outputs == NULL) {
+    if (!log_outputs) {
+        debugEnv = getenv("LIBVIRT_LOG_OUTPUTS");
+        if (debugEnv)
+            log_outputs = strdup(debugEnv);
+    }
+    if (!log_outputs) {
         if (godaemon) {
             char *tmp = NULL;
             if (virAsprintf (&tmp, "%d:syslog:libvirtd", log_level) < 0)
@@ -2499,8 +2509,9 @@ qemudSetLogging(virConfPtr conf, const char *filename) {
         } else {
             virLogParseOutputs("0:stderr:libvirtd");
         }
-    } else
+    } else {
         virLogParseOutputs(log_outputs);
+    }
     ret = 0;
 
 free_and_fail: