picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journald.conf: remove MinSize= settings

Browse source 
There's no point in making this configurable, so let's drop it in order
to simplify configuration a bit.
This commit is contained in:
Lennart Poettering 2012-10-19 00:56:42 +02:00
parent aae9a96d4b
commit 6d9082172c
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
man/journald.conf.xml
View file

@ -201,11 +201,9 @@
<term><varname>SystemMaxUse=</varname></term> <term><varname>SystemMaxUse=</varname></term>
<term><varname>SystemKeepFree=</varname></term> <term><varname>SystemKeepFree=</varname></term>
<term><varname>SystemMaxFileSize=</varname></term> <term><varname>SystemMaxFileSize=</varname></term>
<term><varname>SystemMinFileSize=</varname></term>
<term><varname>RuntimeMaxUse=</varname></term> <term><varname>RuntimeMaxUse=</varname></term>
<term><varname>RuntimeKeepFree=</varname></term> <term><varname>RuntimeKeepFree=</varname></term>
<term><varname>RuntimeMaxFileSize=</varname></term> <term><varname>RuntimeMaxFileSize=</varname></term>
<term><varname>RuntimeMinFileSize=</varname></term>
<listitem><para>Enforce size limits on <listitem><para>Enforce size limits on
the journal files stored. The options the journal files stored. The options
@ -263,16 +261,11 @@
<varname>SystemMaxUse=</varname> and <varname>SystemMaxUse=</varname> and
<varname>RuntimeMaxUse=</varname>, so <varname>RuntimeMaxUse=</varname>, so
that usually seven rotated journal that usually seven rotated journal
files are kept as files are kept as history. Specify
history. <varname>SystemMinFileSize=</varname> values in bytes or use K, M, G, T, P,
and E as units for the specified
<varname>RuntimeMinFileSize=</varname> sizes. Note that size limits are
control how large individual journal enforced synchronously to 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 as they are extended, and need files as they are extended, and need
no explicit rotation step triggered by no explicit rotation step triggered by
time.</para></listitem> time.</para></listitem>

2
src/journal/journald-gperf.gperf
View file

@ -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.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst)
Journal.SystemMaxUse, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use) 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.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.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.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.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.RuntimeKeepFree, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)
Journal.MaxRetentionSec, config_parse_usec, 0, offsetof(Server, max_retention_usec) Journal.MaxRetentionSec, config_parse_usec, 0, offsetof(Server, max_retention_usec)
Journal.MaxFileSec, config_parse_usec, 0, offsetof(Server, max_file_usec) Journal.MaxFileSec, config_parse_usec, 0, offsetof(Server, max_file_usec)

2
src/journal/journald.conf
View file

@ -17,11 +17,9 @@
#SystemMaxUse= #SystemMaxUse=
#SystemKeepFree= #SystemKeepFree=
#SystemMaxFileSize= #SystemMaxFileSize=
#SystemMinFileSize=
#RuntimeMaxUse= #RuntimeMaxUse=
#RuntimeKeepFree= #RuntimeKeepFree=
#RuntimeMaxFileSize= #RuntimeMaxFileSize=
#RuntimeMinFileSize=
#MaxRetentionSec= #MaxRetentionSec=
#MaxFileSec=1month #MaxFileSec=1month
#ForwardToSyslog=yes #ForwardToSyslog=yes