Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

include name and tag of a container into journald message for syslog [WIP] #273

Closed
wants to merge 1 commit into from
Closed

include name and tag of a container into journald message for syslog [WIP] #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/ctr_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ static char *k8s_log_path = NULL;
static char short_cuuid[TRUNC_ID_LEN + 1];
static char *cuuid = NULL;
static char *name = NULL;
static char *msg_prefix = "";
static size_t cuuid_len = 0;
static size_t name_len = 0;
static char *container_id_full = NULL;
Expand Down Expand Up @@ -111,21 +112,23 @@ void configure_log_drivers(gchar **log_drivers, int64_t log_size_max_, char *cuu
short_cuuid[TRUNC_ID_LEN] = '\0';
name = name_;

/* Setup some sd_journal_sendv arguments that won't change */
container_id_full = g_strdup_printf("CONTAINER_ID_FULL=%s", cuuid);
container_id = g_strdup_printf("CONTAINER_ID=%s", short_cuuid);
if (tag) {
container_tag = g_strdup_printf("CONTAINER_TAG=%s", tag);
container_tag_len = strlen(container_tag);
}

/* To maintain backwards compatibility with older versions of conmon, we need to skip setting
* the name value if it isn't present
*/
if (name) {
/* save the length so we don't have to compute every sd_journal_* call */
name_len = strlen(name);
container_name = g_strdup_printf("CONTAINER_NAME=%s", name);
msg_prefix = g_strdup_printf("%s ", name);
}

/* Setup some sd_journal_sendv arguments that won't change */
container_id_full = g_strdup_printf("CONTAINER_ID_FULL=%s", cuuid);
container_id = g_strdup_printf("CONTAINER_ID=%s", short_cuuid);
if (tag) {
container_tag = g_strdup_printf("CONTAINER_TAG=%s", tag);
container_tag_len = strlen(container_tag);
msg_prefix = g_strdup_printf("%s[%s] ", name ?: "", tag);
}
}
}
Expand Down Expand Up @@ -233,8 +236,8 @@ int write_journald(int pipe, char *buf, ssize_t buflen)
char tmp_line_end = buf[line_len];
buf[line_len] = '\0';

_cleanup_free_ char *message = g_strdup_printf("MESSAGE=%s", buf);
if (writev_buffer_append_segment(dev_null, &bufv, message, line_len + MESSAGE_EQ_LEN) < 0)
_cleanup_free_ char *message = g_strdup_printf("MESSAGE=%s%s", msg_prefix, buf);
if (writev_buffer_append_segment(dev_null, &bufv, message, line_len + strlen(msg_prefix) + MESSAGE_EQ_LEN) < 0)
return -1;

/* Restore state of the buffer */
Expand Down