78 lines
3.0 KiB
Diff
78 lines
3.0 KiB
Diff
From d8fabe7a6839eeb0d5d0504471f2d18b07545238 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Tue, 12 May 2020 18:53:35 +0200
|
|
Subject: [PATCH] journald: rework end of line marker handling to use a field
|
|
table
|
|
|
|
(cherry picked from commit 549b7379ba404c33fd448d2bca46a57f6529b00b)
|
|
|
|
Related: #2029426
|
|
---
|
|
src/journal/journald-stream.c | 29 ++++++++++++++++++++---------
|
|
1 file changed, 20 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
|
|
index c8de984335..58752a5a24 100644
|
|
--- a/src/journal/journald-stream.c
|
|
+++ b/src/journal/journald-stream.c
|
|
@@ -54,6 +54,8 @@ typedef enum LineBreak {
|
|
LINE_BREAK_NUL,
|
|
LINE_BREAK_LINE_MAX,
|
|
LINE_BREAK_EOF,
|
|
+ _LINE_BREAK_MAX,
|
|
+ _LINE_BREAK_INVALID = -1,
|
|
} LineBreak;
|
|
|
|
struct StdoutStream {
|
|
@@ -233,7 +235,11 @@ fail:
|
|
return log_error_errno(r, "Failed to save stream data %s: %m", s->state_file);
|
|
}
|
|
|
|
-static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_break) {
|
|
+static int stdout_stream_log(
|
|
+ StdoutStream *s,
|
|
+ const char *p,
|
|
+ LineBreak line_break) {
|
|
+
|
|
struct iovec *iovec;
|
|
int priority;
|
|
char syslog_priority[] = "PRIORITY=\0";
|
|
@@ -245,6 +251,9 @@ static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_brea
|
|
assert(s);
|
|
assert(p);
|
|
|
|
+ assert(line_break >= 0);
|
|
+ assert(line_break < _LINE_BREAK_MAX);
|
|
+
|
|
if (s->context)
|
|
(void) client_context_maybe_refresh(s->server, s->context, NULL, NULL, 0, NULL, USEC_INFINITY);
|
|
else if (pid_is_valid(s->ucred.pid)) {
|
|
@@ -296,17 +305,19 @@ static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_brea
|
|
iovec[n++] = IOVEC_MAKE_STRING(syslog_identifier);
|
|
}
|
|
|
|
- if (line_break != LINE_BREAK_NEWLINE) {
|
|
- const char *c;
|
|
+ static const char * const line_break_field_table[_LINE_BREAK_MAX] = {
|
|
+ [LINE_BREAK_NEWLINE] = NULL, /* Do not add field if traditional newline */
|
|
+ [LINE_BREAK_NUL] = "_LINE_BREAK=nul",
|
|
+ [LINE_BREAK_LINE_MAX] = "_LINE_BREAK=line-max",
|
|
+ [LINE_BREAK_EOF] = "_LINE_BREAK=eof",
|
|
+ };
|
|
|
|
- /* If this log message was generated due to an uncommon line break then mention this in the log
|
|
- * entry */
|
|
+ const char *c = line_break_field_table[line_break];
|
|
|
|
- c = line_break == LINE_BREAK_NUL ? "_LINE_BREAK=nul" :
|
|
- line_break == LINE_BREAK_LINE_MAX ? "_LINE_BREAK=line-max" :
|
|
- "_LINE_BREAK=eof";
|
|
+ /* If this log message was generated due to an uncommon line break then mention this in the log
|
|
+ * entry */
|
|
+ if (c)
|
|
iovec[n++] = IOVEC_MAKE_STRING(c);
|
|
- }
|
|
|
|
message = strappend("MESSAGE=", p);
|
|
if (message)
|