From 6d9082172c831162631eb696b50e9a45406811e7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Oct 2012 00:56:42 +0200 Subject: [PATCH] journald.conf: remove MinSize= settings There's no point in making this configurable, so let's drop it in order to simplify configuration a bit. --- man/journald.conf.xml | 17 +++++------------ src/journal/journald-gperf.gperf | 2 -- src/journal/journald.conf | 2 -- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 66189bd92..70b05f600 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -201,11 +201,9 @@ SystemMaxUse= SystemKeepFree= SystemMaxFileSize= - SystemMinFileSize= RuntimeMaxUse= RuntimeKeepFree= RuntimeMaxFileSize= - RuntimeMinFileSize= Enforce size limits on the journal files stored. The options @@ -263,16 +261,11 @@ SystemMaxUse= and RuntimeMaxUse=, so that usually seven rotated journal - files are kept as - history. SystemMinFileSize= - and - RuntimeMinFileSize= - control how large individual journal - files grow at minimum. Defaults to - 64K. Specify values in bytes or use - K, M, G, T, P, E as units for the - specified sizes. Note that size limits - are enforced synchronously to journal + files are kept as history. Specify + values in bytes or use K, M, G, T, P, + E as units for the specified + sizes. Note that size limits are + enforced synchronously to journal files as they are extended, and need no explicit rotation step triggered by time. diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf index 1635e1cfc..f616be371 100644 --- a/src/journal/journald-gperf.gperf +++ b/src/journal/journald-gperf.gperf @@ -22,11 +22,9 @@ Journal.RateLimitInterval, config_parse_usec, 0, offsetof(Server, rate_lim Journal.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst) Journal.SystemMaxUse, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use) Journal.SystemMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size) -Journal.SystemMinFileSize, config_parse_bytes_off, 0, offsetof(Server, system_metrics.min_size) Journal.SystemKeepFree, config_parse_bytes_off, 0, offsetof(Server, system_metrics.keep_free) Journal.RuntimeMaxUse, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use) Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size) -Journal.RuntimeMinFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.min_size) Journal.RuntimeKeepFree, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free) Journal.MaxRetentionSec, config_parse_usec, 0, offsetof(Server, max_retention_usec) Journal.MaxFileSec, config_parse_usec, 0, offsetof(Server, max_file_usec) diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 49648332c..948318bc6 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -17,11 +17,9 @@ #SystemMaxUse= #SystemKeepFree= #SystemMaxFileSize= -#SystemMinFileSize= #RuntimeMaxUse= #RuntimeKeepFree= #RuntimeMaxFileSize= -#RuntimeMinFileSize= #MaxRetentionSec= #MaxFileSec=1month #ForwardToSyslog=yes -- 2.30.2