picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journald: turn ForwardToSyslog= off by default

Browse source 
After all, rsyslog and friends nowadays read their data directly from
the journal, hence the forwarding is unnecessary in most cases.
This commit is contained in:
Lennart Poettering 2014-07-11 13:30:16 +02:00
parent 1cb1767a29
commit 46b131574f
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/journald.conf.xml
View file

@ -395,8 +395,8 @@
forwarding to syslog is enabled but no forwarding to syslog is enabled but no
syslog daemon is running, the syslog daemon is running, the
respective option has no effect. By respective option has no effect. By
default, only forwarding to syslog and default, only forwarding wall is
wall is enabled. These settings may be enabled. These settings may be
overridden at boot time with the overridden at boot time with the
kernel command line options kernel command line options
<literal>systemd.journald.forward_to_syslog=</literal>, <literal>systemd.journald.forward_to_syslog=</literal>,
@ -405,9 +405,9 @@
and and
<literal>systemd.journald.forward_to_wall=</literal>. <literal>systemd.journald.forward_to_wall=</literal>.
When forwarding to the console, the When forwarding to the console, the
TTY to log to can be changed TTY to log to can be changed with
with <varname>TTYPath=</varname>, <varname>TTYPath=</varname>, described
described below.</para></listitem> below.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

1
src/journal/journald-server.c
View file

@ -1473,7 +1473,6 @@ int server_init(Server *s) {
s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL; s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST; s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
s->forward_to_syslog = true;
s->forward_to_wall = true; s->forward_to_wall = true;
s->max_file_usec = DEFAULT_MAX_FILE_USEC; s->max_file_usec = DEFAULT_MAX_FILE_USEC;

6
src/journal/journald-syslog.c
View file

@ -37,14 +37,14 @@
static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, struct ucred *ucred, struct timeval *tv) { 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_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/syslog", .un.sun_path = "/run/systemd/journal/syslog",
}; };
struct msghdr msghdr = { struct msghdr msghdr = {
.msg_iov = (struct iovec *) iovec, .msg_iov = (struct iovec *) iovec,
.msg_iovlen = n_iovec, .msg_iovlen = n_iovec,
.msg_name = &sa, .msg_name = (struct sockaddr*) &sa.sa,
.msg_namelen = offsetof(union sockaddr_union, un.sun_path) .msg_namelen = offsetof(union sockaddr_union, un.sun_path)
+ strlen("/run/systemd/journal/syslog"), + strlen("/run/systemd/journal/syslog"),
}; };
@ -426,7 +426,7 @@ int server_open_syslog_socket(Server *s) {
assert(s); assert(s);
if (s->syslog_fd < 0) { if (s->syslog_fd < 0) {
union sockaddr_union sa = { static const union sockaddr_union sa = {
.un.sun_family = AF_UNIX, .un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/dev-log", .un.sun_path = "/run/systemd/journal/dev-log",
}; };

2
src/journal/journald.conf
View file

@ -23,7 +23,7 @@
#RuntimeMaxFileSize= #RuntimeMaxFileSize=
#MaxRetentionSec= #MaxRetentionSec=
#MaxFileSec=1month #MaxFileSec=1month
#ForwardToSyslog=yes #ForwardToSyslog=no
#ForwardToKMsg=no #ForwardToKMsg=no
#ForwardToConsole=no #ForwardToConsole=no
#ForwardToWall=yes #ForwardToWall=yes