diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:27:01 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:27:01 +0000 |
| commit | 0acda3abb713d13ee9c7778766a1fff5bbfdd87e (patch) | |
| tree | abc5d8e66d598a5dc1fd96c99f7ca09adb063205 /src/journal/journald-server.c | |
| parent | Releasing progress-linux version 256.4-3~progress7.99u1. (diff) | |
| download | systemd-0acda3abb713d13ee9c7778766a1fff5bbfdd87e.tar.xz systemd-0acda3abb713d13ee9c7778766a1fff5bbfdd87e.zip | |
Merging upstream version 256.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/journal/journald-server.c')
| -rw-r--r-- | src/journal/journald-server.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 717c8e4..07748f0 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1349,9 +1349,10 @@ int server_flush_to_var(Server *s, bool require_flag_file) { start = now(CLOCK_MONOTONIC); r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY | SD_JOURNAL_ASSUME_IMMUTABLE); - if (r < 0) - return log_ratelimit_error_errno(r, JOURNAL_LOG_RATELIMIT, - "Failed to read runtime journal: %m"); + if (r < 0) { + log_ratelimit_error_errno(r, JOURNAL_LOG_RATELIMIT, "Failed to read runtime journal: %m"); + goto finish; + } sd_journal_set_data_threshold(j, 0); |