Commit 48be6e55 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Andrei Vagin

criu: call compel_log_init() at start

Otherwise, messages printed by libcompel are omitted from logs.

Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent a9c99c09
...@@ -706,6 +706,7 @@ int main(int argc, char *argv[], char *envp[]) ...@@ -706,6 +706,7 @@ int main(int argc, char *argv[], char *envp[])
if (log_init(opts.output)) if (log_init(opts.output))
return 1; return 1;
libsoccr_set_log(log_level, print_on_level); libsoccr_set_log(log_level, print_on_level);
compel_log_init(vprint_on_level, log_get_loglevel());
pr_debug("Version: %s (gitid %s)\n", CRIU_VERSION, CRIU_GITID); pr_debug("Version: %s (gitid %s)\n", CRIU_VERSION, CRIU_GITID);
if (opts.deprecated_ok) if (opts.deprecated_ok)
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h>
extern void vprint_on_level(unsigned int loglevel, const char *format,
va_list params);
#endif /* CR_NOGLIBC */ #endif /* CR_NOGLIBC */
......
...@@ -209,7 +209,7 @@ unsigned int log_get_loglevel(void) ...@@ -209,7 +209,7 @@ unsigned int log_get_loglevel(void)
return current_loglevel; return current_loglevel;
} }
static void __print_on_level(unsigned int loglevel, const char *format, va_list params) void vprint_on_level(unsigned int loglevel, const char *format, va_list params)
{ {
int fd, size, ret, off = 0; int fd, size, ret, off = 0;
int __errno = errno; int __errno = errno;
...@@ -246,7 +246,7 @@ void print_on_level(unsigned int loglevel, const char *format, ...) ...@@ -246,7 +246,7 @@ void print_on_level(unsigned int loglevel, const char *format, ...)
va_list params; va_list params;
va_start(params, format); va_start(params, format);
__print_on_level(loglevel, format, params); vprint_on_level(loglevel, format, params);
va_end(params); va_end(params);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment