From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Oct 2020 16:41:06 +0000 (+0100)
Subject: units: turn on timestamping for journald sockets
X-Git-Tag: v247-rc2~50^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17455%2Fhead;p=thirdparty%2Fsystemd.git

units: turn on timestamping for journald sockets

To make things simple and robust when debugging journald, we'll leave
the SO_TIMESTAMP invocations in the C code in place, even if they are
now typically redundant, given that the sockets are already passed into
the process with SO_TIMESTAMP turned on now.
---

diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
index 80ad6ac845f..7cec55440df 100644
--- a/units/systemd-journald-dev-log.socket
+++ b/units/systemd-journald-dev-log.socket
@@ -19,12 +19,13 @@ Before=sockets.target
 IgnoreOnIsolate=yes
 
 [Socket]
-Service=systemd-journald.service
 ListenDatagram=/run/systemd/journal/dev-log
-Symlinks=/dev/log
-SocketMode=0666
 PassCredentials=yes
 PassSecurity=yes
+Service=systemd-journald.service
+SocketMode=0666
+Symlinks=/dev/log
+Timestamping=us
 
 # Increase both the send and receive buffer, so that things don't
 # block early. Note that journald internally uses the this socket both
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index c95ae5ab64b..95d5f21964a 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -19,10 +19,11 @@ Before=sockets.target
 IgnoreOnIsolate=yes
 
 [Socket]
-ListenStream=/run/systemd/journal/stdout
 ListenDatagram=/run/systemd/journal/socket
-SocketMode=0666
+ListenStream=/run/systemd/journal/stdout
 PassCredentials=yes
 PassSecurity=yes
 ReceiveBuffer=8M
 Service=systemd-journald.service
+SocketMode=0666
+Timestamping=us