add file/func/line to debug info

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-09-29 16:14:28 +00:00 committed by Stéphane Graber
parent fce070c815
commit 15bc516ea9

View File

@ -72,6 +72,7 @@ static int log_append_stderr(const struct lxc_log_appender *appender,
return 0; return 0;
fprintf(stderr, "%s: ", log_prefix); fprintf(stderr, "%s: ", log_prefix);
fprintf(stderr, "%s: %s: %d ", event->locinfo->file, event->locinfo->func, event->locinfo->line);
vfprintf(stderr, event->fmt, *event->vap); vfprintf(stderr, event->fmt, *event->vap);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
return 0; return 0;
@ -90,12 +91,14 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
ms = event->timestamp.tv_usec / 1000; ms = event->timestamp.tv_usec / 1000;
n = snprintf(buffer, sizeof(buffer), n = snprintf(buffer, sizeof(buffer),
"%15s %10ld.%03d %-8s %s - ", "%15s %10ld.%03d %-8s %s - %s:%s:%d - ",
log_prefix, log_prefix,
event->timestamp.tv_sec, event->timestamp.tv_sec,
ms, ms,
lxc_log_priority_to_string(event->priority), lxc_log_priority_to_string(event->priority),
event->category); event->category,
event->locinfo->file, event->locinfo->func,
event->locinfo->line);
n += vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt, n += vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt,
*event->vap); *event->vap);