[systemd-commits] 2 commits - man/journald.conf.xml man/systemctl.xml src/journal src/systemctl
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Oct 18 15:57:26 PDT 2012
man/journald.conf.xml | 17 +++++------------
man/systemctl.xml | 11 -----------
src/journal/journald-gperf.gperf | 2 --
src/journal/journald.conf | 2 --
src/systemctl/systemctl.c | 11 -----------
5 files changed, 5 insertions(+), 38 deletions(-)
New commits:
commit 6d9082172c831162631eb696b50e9a45406811e7
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 19 00:56:42 2012 +0200
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.
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 66189bd..70b05f6 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -201,11 +201,9 @@
<term><varname>SystemMaxUse=</varname></term>
<term><varname>SystemKeepFree=</varname></term>
<term><varname>SystemMaxFileSize=</varname></term>
- <term><varname>SystemMinFileSize=</varname></term>
<term><varname>RuntimeMaxUse=</varname></term>
<term><varname>RuntimeKeepFree=</varname></term>
<term><varname>RuntimeMaxFileSize=</varname></term>
- <term><varname>RuntimeMinFileSize=</varname></term>
<listitem><para>Enforce size limits on
the journal files stored. The options
@@ -263,16 +261,11 @@
<varname>SystemMaxUse=</varname> and
<varname>RuntimeMaxUse=</varname>, so
that usually seven rotated journal
- files are kept as
- history. <varname>SystemMinFileSize=</varname>
- and
- <varname>RuntimeMinFileSize=</varname>
- 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.</para></listitem>
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
index 1635e1c..f616be3 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 4964833..948318b 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
commit aae9a96d4b3a8562af9e8c6a23871b442645b954
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 19 00:12:46 2012 +0200
systemctl: remove --follow option
Given that "journalctl -u" exists now there's no need to duplicate this
functionality in systemctl, so let's drop this, especially given that it
always felt a bit awkward to overload "-f" to both --force and --follow,
and to have continues output with a status header for this.
systemctl status -f avahi-daemon
now becomes:
journalctl -fu avahi-daemon
Which is shorter and a lot less redundant.
diff --git a/man/systemctl.xml b/man/systemctl.xml
index fedc588..c452dfc 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -443,17 +443,6 @@
</varlistentry>
<varlistentry>
- <term><option>--follow</option></term>
- <term><option>-f</option></term>
-
- <listitem><para>When used with
- <command>status</command> continuously
- prints new journal entries as they are
- appended to the
- journal.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--output=</option></term>
<term><option>-o</option></term>
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d77d534..545d7e1 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -123,7 +123,6 @@ static enum transport {
TRANSPORT_POLKIT
} arg_transport = TRANSPORT_NORMAL;
static const char *arg_host = NULL;
-static bool arg_follow = false;
static unsigned arg_lines = 10;
static OutputMode arg_output = OUTPUT_SHORT;
@@ -2277,7 +2276,6 @@ static void print_status_info(UnitStatusInfo *i) {
arg_all * OUTPUT_SHOW_ALL |
(!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH |
on_tty() * OUTPUT_COLOR |
- arg_follow * OUTPUT_FOLLOW |
!arg_quiet * OUTPUT_WARN_CUTOFF;
printf("\n");
@@ -3928,7 +3926,6 @@ static int systemctl_help(void) {
" --root=PATH Enable unit files in the specified root directory\n"
" --runtime Enable unit files only temporarily until next reboot\n"
" -n --lines=INTEGER Journal entries to show\n"
- " --follow Follow journal\n"
" -o --output=STRING Change journal output mode (short, short-monotonic,\n"
" verbose, export, json, json-pretty, json-sse, cat)\n\n"
"Unit Commands:\n"
@@ -4084,7 +4081,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
ARG_NO_ASK_PASSWORD,
ARG_FAILED,
ARG_RUNTIME,
- ARG_FOLLOW,
ARG_FORCE
};
@@ -4118,7 +4114,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "privileged",no_argument, NULL, 'P' },
{ "runtime", no_argument, NULL, ARG_RUNTIME },
{ "lines", required_argument, NULL, 'n' },
- { "follow", no_argument, NULL, ARG_FOLLOW },
{ "output", required_argument, NULL, 'o' },
{ NULL, 0, NULL, 0 }
};
@@ -4238,14 +4233,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
arg_force ++;
break;
- case ARG_FOLLOW:
- arg_follow = true;
- break;
-
case 'f':
- /* -f is short for both --follow and --force! */
arg_force ++;
- arg_follow = true;
break;
case ARG_NO_RELOAD:
More information about the systemd-commits
mailing list