From 46b131574fdd7d77c15a0919ca9010cad7aa6ac7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Jul 2014 13:30:16 +0200
Subject: journald: turn ForwardToSyslog= off by default
After all, rsyslog and friends nowadays read their data directly from
the journal, hence the forwarding is unnecessary in most cases.
---
src/journal/journald-server.c | 1 -
src/journal/journald-syslog.c | 6 +++---
src/journal/journald.conf | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 58410a2465..f8da4daa41 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1473,7 +1473,6 @@ int server_init(Server *s) {
s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
- s->forward_to_syslog = true;
s->forward_to_wall = true;
s->max_file_usec = DEFAULT_MAX_FILE_USEC;
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index b826e23c01..afeb8bd129 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -37,14 +37,14 @@
static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, struct ucred *ucred, struct timeval *tv) {
- union sockaddr_union sa = {
+ static const union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/syslog",
};
struct msghdr msghdr = {
.msg_iov = (struct iovec *) iovec,
.msg_iovlen = n_iovec,
- .msg_name = &sa,
+ .msg_name = (struct sockaddr*) &sa.sa,
.msg_namelen = offsetof(union sockaddr_union, un.sun_path)
+ strlen("/run/systemd/journal/syslog"),
};
@@ -426,7 +426,7 @@ int server_open_syslog_socket(Server *s) {
assert(s);
if (s->syslog_fd < 0) {
- union sockaddr_union sa = {
+ static const union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/dev-log",
};
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index cded4a9d47..2073f1bf21 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -23,7 +23,7 @@
#RuntimeMaxFileSize=
#MaxRetentionSec=
#MaxFileSec=1month
-#ForwardToSyslog=yes
+#ForwardToSyslog=no
#ForwardToKMsg=no
#ForwardToConsole=no
#ForwardToWall=yes
--
cgit v1.2.3-54-g00ecf