Add container labels to JournalD logs #553
Conversation
Signed-off-by: OZoneGuy <[email protected]>
OZoneGuy
force-pushed
the
feat/log-labels
branch
from
08aa60a to
84675f1
Compare
Signed-off-by: OZoneGuy <[email protected]>
pass NULL as the first argument for subsequent calls Signed-off-by: OZoneGuy <[email protected]>
OZoneGuy
force-pushed
the
feat/log-labels
branch
from
8a1db71 to
53f81bd
Compare
| container_labels = g_alloca((sizeof(char *)) * container_labels_count); | ||
| container_labels_lengths = g_alloca((sizeof(int *)) * container_labels_count); |
There was a problem hiding this comment.
when are these ever going to be freed? In this way they are just leaked
There was a problem hiding this comment.
The idea is to create them once in at the beginning of the program lifecycle and reuse them. I will look into freeing them at the at exit.
There was a problem hiding this comment.
that is fine, could you just add an inline comment saying it is by design?
| } | ||
| container_labels = g_alloca((sizeof(char *)) * container_labels_count); | ||
| container_labels_lengths = g_alloca((sizeof(int *)) * container_labels_count); | ||
| char *pair = strtok(log_labels, ","); |
There was a problem hiding this comment.
strtok modifies the buffer, so log_labels will be modified. The correct way to do it is to g_strdup the string before passing it to strtok.
| if (writev_buffer_append_segment_no_flush(&bufv, container_labels[i], container_labels_lengths[i]) < 0) | ||
| return -1; | ||
| } |
There was a problem hiding this comment.
I suggest to not create the arrays before and then have to worry about cleaning them up.
Just strdup container_labels here and call writev_buffer_append_segment_no_flush while you parse it.
Add the ability to add the container labels to the journald logs as extra parameters.
Relies on the caller to pass the label key and value.
Usage:
The labels and values will be added to the journald entry.
This is my first contribution to a C codebase. Feedback is most
Still need to test the changes locally.