From: Martin Pitt Date: Fri, 28 Nov 2014 13:43:25 +0000 (+0100) Subject: Re-enable journal forwarding to syslog X-Git-Tag: archive/raspbian/239-15+rpi1^2~13 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e858e5aaa428e8fd3efedd456245e14517626816;p=systemd.git Re-enable journal forwarding to syslog Revert upstream commit 46b131574fdd7d77 for now, until Debian's sysloggers can/do all read from the journal directly. See http://lists.freedesktop.org/archives/systemd-devel/2014-November/025550.html for details. Once we grow a journal.conf.d/ directory, sysloggers can be moved to pulling from the journal one by one and disable forwarding again in such a conf.d snippet. Gbp-Pq: Topic debian Gbp-Pq: Name Re-enable-journal-forwarding-to-syslog.patch --- diff --git a/man/journald.conf.xml b/man/journald.conf.xml index ee8e8b7f..889d3c9a 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -286,7 +286,7 @@ the system console, or sent as wall messages to all logged-in users. These options take boolean arguments. If forwarding to syslog is enabled but nothing reads messages from the socket, forwarding to syslog has no effect. By default, - only forwarding to wall is enabled. These settings may be overridden at boot time + only forwarding to syslog and wall is enabled. These settings may be overridden at boot time with the kernel command line options systemd.journald.forward_to_syslog, systemd.journald.forward_to_kmsg, diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 4f1550ec..f48059da 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1692,6 +1692,7 @@ 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.conf b/src/journal/journald.conf index 94d5c678..a397799d 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -29,7 +29,7 @@ #RuntimeMaxFiles=100 #MaxRetentionSec= #MaxFileSec=1month -#ForwardToSyslog=no +#ForwardToSyslog=yes #ForwardToKMsg=no #ForwardToConsole=no #ForwardToWall=yes