[libvirt] [PATCH 3/3] Improve log filtering in virLXCProcessReadLogOutputData

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Make the virLXCProcessReadLogOutputData method ignore the log lines about the container startup argv, ignore the generic error message from libvirt_lxc when lxcContainerMain fails and skip over blank lines. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/lxc/lxc_process.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 5a091e6..8ede404 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -807,6 +807,20 @@ cleanup: } +static bool +virLXCProcessIgnorableLogLine(const char *str) +{ + if (virLogProbablyLogMessage(str)) + return true; + if (strstr(str, "PATH=")) + return true; + if (strstr(str, "error receiving signal from container")) + return true; + if (STREQ(str, "")) + return true; + return false; +} + static int virLXCProcessReadLogOutputData(virDomainObjPtr vm, int fd, @@ -844,7 +858,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, /* Filter out debug messages from intermediate libvirt process */ while ((eol = strchr(filter_next, '\n'))) { *eol = '\0'; - if (virLogProbablyLogMessage(filter_next)) { + if (virLXCProcessIgnorableLogLine(filter_next)) { memmove(filter_next, eol + 1, got - (eol - buf)); got -= eol + 1 - filter_next; } else { -- 1.8.3.1