Merge pull request #13084 from ddstreet/log_time

log: add support for prefixing console log messages with current timestamp

3 files changed, 47 insertions, 28 deletions

diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml
index f3dbb47a61..20a5572192 100644
--- a/man/systemd-socket-activate.xml
+++ b/man/systemd-socket-activate.xml
@@ -141,6 +141,7 @@
       <varlistentry>
         <term><varname>$SYSTEMD_LOG_TARGET</varname></term>
         <term><varname>$SYSTEMD_LOG_LEVEL</varname></term>
+        <term><varname>$SYSTEMD_LOG_TIME</varname></term>
         <term><varname>$SYSTEMD_LOG_COLOR</varname></term>
         <term><varname>$SYSTEMD_LOG_LOCATION</varname></term>
 
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index e22b335d30..435c3882db 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -63,10 +63,11 @@
     <variablelist class='config-directives'>
 
       <varlistentry>
-        <term><varname>LogLevel=</varname></term>
-        <term><varname>LogTarget=</varname></term>
         <term><varname>LogColor=</varname></term>
+        <term><varname>LogLevel=</varname></term>
         <term><varname>LogLocation=</varname></term>
+        <term><varname>LogTarget=</varname></term>
+        <term><varname>LogTime=</varname></term>
         <term><varname>DumpCore=yes</varname></term>
         <term><varname>CrashChangeVT=no</varname></term>
         <term><varname>CrashShell=no</varname></term>
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>