summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenaud Métrich <1163635+rmetrich@users.noreply.github.com>2018-09-03 05:42:39 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-12-11 17:55:24 +0100
commit7fdcc0e9cc7f047a778a2f1776d2398f46c6ac86 (patch)
treebb235d39521f71b43bfa316e8f5ed1f4a3f4b7cf
parenta9e1b3a33f65721e7f77f8d8253512dd16cbafdb (diff)
downloadsystemd-7fdcc0e9cc7f047a778a2f1776d2398f46c6ac86.tar.gz
journald: fixed assertion failure when system journal rotation fails (#9893)
(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9) (cherry picked from commit 33aa231f5bf3335cdacfb38ffba757865019ce4d) Related: #1781712
-rw-r--r--src/journal/journald-server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 8de45552f6..f2d2856e03 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1041,7 +1041,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
r = 0;
finish:
- journal_file_post_change(s->system_journal);
+ if (s->system_journal)
+ journal_file_post_change(s->system_journal);
s->runtime_journal = journal_file_close(s->runtime_journal);