From e36af9f8c1d163b58c8d5cb4535b0ee6ca59c506 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 1 May 2012 10:47:53 +0100 Subject: [PATCH] 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 (cherry picked from commit 43ee98731256673b903d7ddf996eec7b4f72b99d) --- src/lxc/lxc_controller.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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",