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-10-22 16:25:49 +0200
commit33aa231f5bf3335cdacfb38ffba757865019ce4d (patch)
treef9e48401c0c64ac182d83646afeca9806bfbfe5a
parent55d9d6dfb731d2f1c8c940fb8a7ea0af6c498c4c (diff)
downloadsystemd-33aa231f5bf3335cdacfb38ffba757865019ce4d.tar.gz
journald: fixed assertion failure when system journal rotation fails (#9893)
(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9) Resolves: #1763619
-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 0c983e102a..6aecb67d6c 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);