You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.4 KiB
36 lines
1.4 KiB
2 years ago
|
From af43906bb0c8f2bb3b135d68d56ea2fa58fa9e60 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Wed, 5 Dec 2018 17:33:15 +0100
|
||
|
|
Subject: [PATCH] coredump: remove duplicate MESSAGE= prefix from message
|
||
|
|
|
||
|
|
systemd-coredump[9982]: MESSAGE=Process 771 (systemd-journal) of user 0 dumped core.
|
||
|
|
systemd-coredump[9982]: Coredump diverted to /var/lib/systemd/coredump/core...
|
||
|
|
|
||
|
|
log_dispatch() calls log_dispatch_internal() which calls write_to_journal()
|
||
|
|
which appends MESSAGE= on its own.
|
||
|
|
|
||
|
|
(cherry-picked from commit 4f62556d71206ac814a020a954b397d4940e14c3)
|
||
|
|
|
||
|
|
Related: #1664976
|
||
|
|
---
|
||
|
|
src/coredump/coredump.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
|
||
|
|
index 20a1cbdd45..d7dd81c1b4 100644
|
||
|
|
--- a/src/coredump/coredump.c
|
||
|
|
+++ b/src/coredump/coredump.c
|
||
|
|
@@ -789,9 +789,10 @@ log:
|
||
|
|
return log_oom();
|
||
|
|
|
||
|
|
if (journald_crash) {
|
||
|
|
- /* We cannot log to the journal, so just print the MESSAGE.
|
||
|
|
+ /* We cannot log to the journal, so just print the message.
|
||
|
|
* The target was set previously to something safe. */
|
||
|
|
- log_dispatch(LOG_ERR, 0, core_message);
|
||
|
|
+ assert(startswith(core_message, "MESSAGE="));
|
||
|
|
+ log_dispatch(LOG_ERR, 0, core_message + strlen("MESSAGE="));
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|