From b65c06ecaa97a92bd78e32469e21d0ab8e0bc864 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Fri, 31 May 2013 13:59:00 +0200 Subject: [PATCH] journal: take KeepFree into account when reporting maximum size Use available_space() instead of just the MaxUse metric when reporting the maximum journal size during startup. --- src/journal/journald-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index da5b725..0d4a82d 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -819,7 +819,7 @@ static int system_journal_open(Server *s) { server_fix_perms(s, s->system_journal, 0); server_driver_message(s, SD_ID128_NULL, "Allowing system journal files to grow to %s.", - format_bytes(fb, sizeof(fb), s->system_metrics.max_use)); + format_bytes(fb, sizeof(fb), available_space(s))); } else if (r < 0) { @@ -873,7 +873,7 @@ static int system_journal_open(Server *s) { server_fix_perms(s, s->runtime_journal, 0); server_driver_message(s, SD_ID128_NULL, "Allowing runtime journal files to grow to %s.", - format_bytes(fb, sizeof(fb), s->runtime_metrics.max_use)); + format_bytes(fb, sizeof(fb), available_space(s))); } } -- 1.8.3