External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Improve log filtering in virLXCProcessReadLogOutputData

Browse Source 
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@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-10-14 13:07:22 +01:00
parent 01100c7f60
commit 5a1cb1075a
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxc_process.c
View File

@ -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 static int
virLXCProcessReadLogOutputData(virDomainObjPtr vm, virLXCProcessReadLogOutputData(virDomainObjPtr vm,
int fd, int fd,
@ -844,7 +858,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm,
/* Filter out debug messages from intermediate libvirt process */ /* Filter out debug messages from intermediate libvirt process */
while ((eol = strchr(filter_next, '\n'))) { while ((eol = strchr(filter_next, '\n'))) {
*eol = '\0'; *eol = '\0';
if (virLogProbablyLogMessage(filter_next)) { if (virLXCProcessIgnorableLogLine(filter_next)) {
memmove(filter_next, eol + 1, got - (eol - buf)); memmove(filter_next, eol + 1, got - (eol - buf));
got -= eol + 1 - filter_next; got -= eol + 1 - filter_next;
} else { } else {