diff options
Diffstat (limited to '')
| -rw-r--r-- | src/journal/journald-server.c | 7 | ||||
| -rw-r--r-- | src/journal/journald.c | 3 | ||||
| -rw-r--r-- | src/journal/journald.conf | 2 |
3 files changed, 6 insertions, 6 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); diff --git a/src/journal/journald.c b/src/journal/journald.c index 2f013c2..87ed22e 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -94,8 +94,7 @@ static int run(int argc, char *argv[]) { /* The retention time is reached, so let's vacuum! */ if (t <= 0) { - log_info("Retention time reached, rotating."); - server_rotate(s); + log_info("Retention time reached, vacuuming."); server_vacuum(s, /* verbose = */ false); continue; } diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 13cdd63..9a12ca7 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -32,7 +32,7 @@ #RuntimeKeepFree= #RuntimeMaxFileSize= #RuntimeMaxFiles=100 -#MaxRetentionSec= +#MaxRetentionSec=0 #MaxFileSec=1month #ForwardToSyslog=no #ForwardToKMsg=no |