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 80ad6ac845f473efcd3ef0f712ab0c0d330f1f57..7cec55440dfcccc38ea2c85bb4ec516c0f7aeb29 100644 (file)
--- 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 c95ae5ab64b8f1bbf8985ae2986d4cf0c87d26e7..95d5f21964ac74ee809c05d51b946d6b073cd82c 100644 (file)
--- 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