proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 01:18:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

log: add additional info of dlog

Browse Source 
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
This commit is contained in:
2xsec 2018-09-14 18:28:44 +09:00
parent 8178adc6ad
commit de1c05f339
No known key found for this signature in database
GPG Key ID: 0BE2750EE612F372
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lxc/log.c
View File

@ -372,33 +372,49 @@ again:
static int log_append_dlog(const struct lxc_log_appender *appender, static int log_append_dlog(const struct lxc_log_appender *appender,
struct lxc_log_event *event) struct lxc_log_event *event)
{ {
if (event->priority < LXC_LOG_LEVEL_ERROR) char *msg = lxc_log_get_va_msg(event);
return 0; const char *log_container_name = lxc_log_get_container_name();
switch(event->priority) { switch (event->priority) {
case LXC_LOG_LEVEL_TRACE: case LXC_LOG_LEVEL_TRACE:
case LXC_LOG_LEVEL_DEBUG: case LXC_LOG_LEVEL_DEBUG:
LOG_VA(LOG_DEBUG, LOG_TAG, event->fmt, *event->vap); print_log(DLOG_DEBUG, LOG_TAG, "%s: %s(%d) > [%s] %s",
event->locinfo->file, event->locinfo->func, event->locinfo->line,
log_container_name ? log_container_name : "-",
msg ? msg : "-");
break; break;
case LXC_LOG_LEVEL_INFO: case LXC_LOG_LEVEL_INFO:
LOG_VA(LOG_INFO, LOG_TAG, event->fmt, *event->vap); print_log(DLOG_INFO, LOG_TAG, "%s: %s(%d) > [%s] %s",
event->locinfo->file, event->locinfo->func, event->locinfo->line,
log_container_name ? log_container_name : "-",
msg ? msg : "-");
break; break;
case LXC_LOG_LEVEL_NOTICE: case LXC_LOG_LEVEL_NOTICE:
case LXC_LOG_LEVEL_WARN: case LXC_LOG_LEVEL_WARN:
LOG_VA(LOG_WARN, LOG_TAG, event->fmt, *event->vap); print_log(DLOG_WARN, LOG_TAG, "%s: %s(%d) > [%s] %s",
event->locinfo->file, event->locinfo->func, event->locinfo->line,
log_container_name ? log_container_name : "-",
msg ? msg : "-");
break; break;
case LXC_LOG_LEVEL_ERROR: case LXC_LOG_LEVEL_ERROR:
LOG_VA(LOG_ERROR, LOG_TAG, event->fmt, *event->vap); print_log(DLOG_ERROR, LOG_TAG, "%s: %s(%d) > [%s] %s",
event->locinfo->file, event->locinfo->func, event->locinfo->line,
log_container_name ? log_container_name : "-",
msg ? msg : "-");
break; break;
case LXC_LOG_LEVEL_CRIT: case LXC_LOG_LEVEL_CRIT:
case LXC_LOG_LEVEL_ALERT: case LXC_LOG_LEVEL_ALERT:
case LXC_LOG_LEVEL_FATAL: case LXC_LOG_LEVEL_FATAL:
LOG_VA(LOG_FATAL, LOG_TAG, event->fmt, *event->vap); print_log(DLOG_FATAL, LOG_TAG, "%s: %s(%d) > [%s] %s",
event->locinfo->file, event->locinfo->func, event->locinfo->line,
log_container_name ? log_container_name : "-",
msg ? msg : "-");
break; break;
default: default:
break; break;
} }
free(msg);
return 0; return 0;
} }
#endif #endif
@ -439,7 +455,7 @@ static struct lxc_log_category log_root = {
#if HAVE_DLOG #if HAVE_DLOG
struct lxc_log_category lxc_log_category_lxc = { struct lxc_log_category lxc_log_category_lxc = {
.name = "lxc", .name = "lxc",
.priority = LXC_LOG_LEVEL_ERROR, .priority = LXC_LOG_LEVEL_TRACE,
.appender = &log_appender_dlog, .appender = &log_appender_dlog,
.parent = &log_root .parent = &log_root
}; };