From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 18 Nov 2010 13:05:19 +0000 (+0000)
Subject: Ensure virExec preserves logging environment
X-Git-Tag: v0.8.6~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882f78c3cb60f3f9fb04dad2877252012db3ced3;p=thirdparty%2Flibvirt.git

Ensure virExec preserves logging environment

The virFork call resets all logging handlers that may have been
set. Re-enable them after fork in virExec, so that env variables
fir LIBVIRT_LOG_OUTPUTS and LIBVIRT_LOG_FILTERS take effect
until the execve()

* src/util/util.c: Preserve logging in child in virExec
---

diff --git a/src/util/util.c b/src/util/util.c
index f2fe58a848..a0849e1a37 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -602,6 +602,9 @@ __virExec(const char *const*argv,
         childout = -1;
     }
 
+    /* Initialize full logging for a while */
+    virLogSetFromEnv();
+
     /* Daemonize as late as possible, so the parent process can detect
      * the above errors with wait* */
     if (flags & VIR_EXEC_DAEMON) {
@@ -650,6 +653,9 @@ __virExec(const char *const*argv,
         virClearCapabilities() < 0)
         goto fork_error;
 
+    /* Close logging again to ensure no FDs leak to child */
+    virLogReset();
+
     if (envp)
         execve(argv[0], (char **) argv, (char**)envp);
     else