aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-12-05 17:33:15 +0100
committerMike Gilbert <floppym@gentoo.org>2019-01-09 10:11:48 -0500
commit9ea7d35d5fb0528cdb1447350b6701698b623355 (patch)
tree16938ae39dbbf1cf61986002b76f5cdcd94a1dc3
parentDisable test_lz4_decompress_partial (diff)
downloadsystemd-9ea7d35d5fb0528cdb1447350b6701698b623355.tar.gz
systemd-9ea7d35d5fb0528cdb1447350b6701698b623355.tar.bz2
systemd-9ea7d35d5fb0528cdb1447350b6701698b623355.zip
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.
-rw-r--r--src/coredump/coredump.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 20a1cbdd4..d7dd81c1b 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;
}