summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-07-23 02:32:29 +0200
committerDaniel Mack <github@zonque.org>2015-07-23 02:32:29 +0200
commit6aafa9483d167f55a50e01f4dc5984866f12c8ec (patch)
treeb62ae29f79c41788651fe079a5c345616125ab46
parentebbc7bc91dd568314225b9dc0876ecc079f0cbaa (diff)
parentda2e288bbc4d8cebaa1d38a80f6eec8cde3e9cce (diff)
Merge pull request #665 from poettering/reword-journal-size-msg
journal: reword msg about enforced size limits a bit
-rw-r--r--src/journal/journald-server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 46358e1c1a..28b1472ac8 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -175,9 +175,11 @@ static uint64_t available_space(Server *s, bool verbose) {
fb4[FORMAT_BYTES_MAX], fb5[FORMAT_BYTES_MAX];
server_driver_message(s, SD_MESSAGE_JOURNAL_USAGE,
- "%s journal is using %s (max allowed %s, "
- "trying to leave %s free of %s available → current limit %s).",
- s->system_journal ? "Permanent" : "Runtime",
+ "%s is currently using %s.\n"
+ "Maximum allowed usage is set to %s.\n"
+ "Leaving at least %s free (of currently available %s of space).\n"
+ "Enforced usage limit is thus %s.",
+ s->system_journal ? "Permanent journal (/var/log/journal/)" : "Runtime journal (/run/log/journal/)",
format_bytes(fb1, sizeof(fb1), sum),
format_bytes(fb2, sizeof(fb2), m->max_use),
format_bytes(fb3, sizeof(fb3), m->keep_free),