diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-05 17:33:15 +0100 |
|---|---|---|
| committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-02-07 12:57:43 +0100 |
| commit | af43906bb0c8f2bb3b135d68d56ea2fa58fa9e60 (patch) | |
| tree | 65ad2519b3241d0c7f5e329ebdc801380b49be31 | |
| parent | 63e71bda5a00c04c16f330cfc0e6f91e7dcead59 (diff) | |
| download | systemd-af43906bb0c8f2bb3b135d68d56ea2fa58fa9e60.tar.gz | |
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
| -rw-r--r-- | src/coredump/coredump.c | 5 |
1 files 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; } |