From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 1 May 2012 09:47:53 +0000 (+0100)
Subject: Ensure logging is initialized early in libvirt_lxc
X-Git-Tag: v0.9.12-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ee98731256673b903d7ddf996eec7b4f72b99d;p=thirdparty%2Flibvirt.git

Ensure logging is initialized early in libvirt_lxc

The virLogSetFromEnv call was done too late in startup to
catch many log messages (eg from security driver initialization).
To assist debugging also explicitly log the security details
at startup
---

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 1e3ec30d56..26b3115b9d 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -1668,6 +1668,9 @@ int main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
+    /* Initialize logging */
+    virLogSetFromEnv();
+
     while (1) {
         int c;
 
@@ -1784,6 +1787,12 @@ int main(int argc, char *argv[])
                                      0)) == NULL)
         goto cleanup;
 
+    VIR_DEBUG("Security model %s type %s label %s imagelabel %s",
+              NULLSTR(def->seclabel.model),
+              virDomainSeclabelTypeToString(def->seclabel.type),
+              NULLSTR(def->seclabel.label),
+              NULLSTR(def->seclabel.imagelabel));
+
     if (def->nnets != nveths) {
         fprintf(stderr, "%s: expecting %d veths, but got %d\n",
                 argv[0], def->nnets, nveths);
@@ -1828,9 +1837,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    /* Initialize logging */
-    virLogSetFromEnv();
-
     /* Accept initial client which is the libvirtd daemon */
     if ((client = accept(monitor, NULL, 0)) < 0) {
         virReportSystemError(errno, "%s",