summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-10-26 17:41:06 +0100
committerLennart Poettering <lennart@poettering.net>2020-10-27 14:13:03 +0100
commit02229dff2b371f3a6235fe18ea72e972ddbc90a9 (patch)
treea7c956f124854afecba3e900ea4a761824b4a8fe
parent95923d7e13ebd41aa09f9367cd3666529fccd214 (diff)
downloadsystemd-02229dff2b371f3a6235fe18ea72e972ddbc90a9.tar.gz
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.
-rw-r--r--units/systemd-journald-dev-log.socket7
-rw-r--r--units/systemd-journald.socket5
2 files changed, 7 insertions, 5 deletions
diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
index 80ad6ac845..7cec55440d 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 c95ae5ab64..95d5f21964 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