diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-03-30 17:57:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 17:57:34 +0200 |
| commit | 01262d0d9e46a9e987c1e62739def55191d5c895 (patch) | |
| tree | 467b8465ed8ff6a22954ac040995d8d1d9cf7654 /man/systemd.xml | |
| parent | 6305608f1c9509672c1c0e089699a826bc65069a (diff) | |
| parent | c5673ed0de3bec38f68d8113d253842b47766e27 (diff) | |
| download | systemd-01262d0d9e46a9e987c1e62739def55191d5c895.tar.gz | |
Merge pull request #13084 from ddstreet/log_time
log: add support for prefixing console log messages with current timestamp
Diffstat (limited to 'man/systemd.xml')
| -rw-r--r-- | man/systemd.xml | 69 |
1 files changed, 43 insertions, 26 deletions
diff --git a/man/systemd.xml b/man/systemd.xml index 94b3845a0e..f5e4a9526c 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -607,6 +607,13 @@ <variablelist class='environment-variables'> <varlistentry> + <term><varname>$SYSTEMD_LOG_COLOR</varname></term> + <listitem><para>Controls whether systemd highlights important + log messages. This can be overridden with + <option>--log-color</option>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>$SYSTEMD_LOG_LEVEL</varname></term> <listitem><para>systemd reads the log level from this environment variable. This can be overridden with @@ -614,6 +621,13 @@ </varlistentry> <varlistentry> + <term><varname>$SYSTEMD_LOG_LOCATION</varname></term> + <listitem><para>Controls whether systemd prints the code + location along with log messages. This can be overridden with + <option>--log-location</option>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>$SYSTEMD_LOG_TARGET</varname></term> <listitem><para>systemd reads the log target from this environment variable. This can be overridden with @@ -621,17 +635,10 @@ </varlistentry> <varlistentry> - <term><varname>$SYSTEMD_LOG_COLOR</varname></term> - <listitem><para>Controls whether systemd highlights important - log messages. This can be overridden with - <option>--log-color=</option>.</para></listitem> - </varlistentry> - - <varlistentry> - <term><varname>$SYSTEMD_LOG_LOCATION</varname></term> - <listitem><para>Controls whether systemd prints the code - location along with log messages. This can be overridden with - <option>--log-location=</option>.</para></listitem> + <term><varname>$SYSTEMD_LOG_TIME</varname></term> + <listitem><para>Controls whether systemd prefixes log + messages with the current time. This can be overridden with + <option>--log-time=</option>.</para></listitem> </varlistentry> <varlistentry> @@ -829,18 +836,21 @@ </varlistentry> <varlistentry> - <term><varname>systemd.log_target=</varname></term> - <term><varname>systemd.log_level=</varname></term> - <term><varname>systemd.log_location=</varname></term> <term><varname>systemd.log_color</varname></term> + <term><varname>systemd.log_level=</varname></term> + <term><varname>systemd.log_location</varname></term> + <term><varname>systemd.log_target=</varname></term> + <term><varname>systemd.log_time</varname></term> <listitem><para>Controls log output, with the same effect as the - <varname>$SYSTEMD_LOG_TARGET</varname>, + <varname>$SYSTEMD_LOG_COLOR</varname>, <varname>$SYSTEMD_LOG_LEVEL</varname>, <varname>$SYSTEMD_LOG_LOCATION</varname>, - <varname>$SYSTEMD_LOG_COLOR</varname> environment variables described above. - <varname>systemd.log_color</varname> can be specified without an argument, - with the same effect as a positive boolean.</para></listitem> + <varname>$SYSTEMD_LOG_TARGET</varname>, + <varname>$SYSTEMD_LOG_TIME</varname>, environment variables described above. + <varname>systemd.log_color</varname>, <varname>systemd.log_location</varname>, and + <varname>systemd.log_time</varname> can be specified without an argument, with the + same effect as a positive boolean.</para></listitem> </varlistentry> <varlistentry> @@ -1135,9 +1145,10 @@ </varlistentry> <varlistentry> - <term><option>--log-target=</option></term> + <term><option>--log-color</option></term> - <listitem><para>Set log target. See <varname>systemd.log_target</varname> above.</para></listitem> + <listitem><para>Highlight important log messages. See <varname>systemd.log_color</varname> above. + </para></listitem> </varlistentry> <varlistentry> @@ -1147,17 +1158,23 @@ </varlistentry> <varlistentry> - <term><option>--log-color</option></term> + <term><option>--log-location</option></term> - <listitem><para>Highlight important log messages. See <varname>systemd.log_color</varname> above. - </para></listitem> + <listitem><para>Include code location in log messages. See <varname>systemd.log_location</varname> + above.</para></listitem> </varlistentry> <varlistentry> - <term><option>--log-location</option></term> + <term><option>--log-target=</option></term> - <listitem><para>Include code location in log messages. See <varname>systemd.log_location</varname> - above.</para></listitem> + <listitem><para>Set log target. See <varname>systemd.log_target</varname> above.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--log-time=</option></term> + + <listitem><para>Prefix messages with timestamp. See <varname>systemd.log_time</varname> above. + </para></listitem> </varlistentry> <varlistentry> |