daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 1b8d3a9c51d5584b6f6e394592a83b43cfbc693d Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Mon, 25 Jan 2016 14:03:47 +0100
803fb7
Subject: [PATCH] Revert "journald: turn ForwardToSyslog= off by default"
803fb7
803fb7
This reverts commit 46b131574fdd7d77c15a0919ca9010cad7aa6ac7.
803fb7
803fb7
rhel-only
803fb7
803fb7
Resolves: #1285642
803fb7
---
803fb7
 man/journald.conf.xml         | 2 +-
803fb7
 src/journal/journald-server.c | 1 +
803fb7
 src/journal/journald.conf     | 2 +-
803fb7
 3 files changed, 3 insertions(+), 2 deletions(-)
803fb7
803fb7
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
803fb7
index 2cbe58bc1..c4f71e887 100644
803fb7
--- a/man/journald.conf.xml
803fb7
+++ b/man/journald.conf.xml
803fb7
@@ -302,7 +302,7 @@
803fb7
         These options take boolean arguments. If forwarding to syslog
803fb7
         is enabled but nothing reads messages from the socket,
803fb7
         forwarding to syslog has no effect. By default, only
803fb7
-        forwarding to wall is enabled. These settings may be
803fb7
+        forwarding to syslog and wall is enabled. These settings may be
803fb7
         overridden at boot time with the kernel command line options
803fb7
         <literal>systemd.journald.forward_to_syslog=</literal>,
803fb7
         <literal>systemd.journald.forward_to_kmsg=</literal>,
803fb7
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
803fb7
index f13147f65..6a35ebbde 100644
803fb7
--- a/src/journal/journald-server.c
803fb7
+++ b/src/journal/journald-server.c
803fb7
@@ -1470,6 +1470,7 @@ int server_init(Server *s) {
803fb7
         s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
803fb7
         s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
803fb7
 
803fb7
+        s->forward_to_syslog = true;
803fb7
         s->forward_to_wall = true;
803fb7
 
803fb7
         s->max_file_usec = DEFAULT_MAX_FILE_USEC;
803fb7
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
803fb7
index 47eefe91c..3907dfb7f 100644
803fb7
--- a/src/journal/journald.conf
803fb7
+++ b/src/journal/journald.conf
803fb7
@@ -27,7 +27,7 @@
803fb7
 #RuntimeMaxFileSize=
803fb7
 #MaxRetentionSec=
803fb7
 #MaxFileSec=1month
803fb7
-#ForwardToSyslog=no
803fb7
+#ForwardToSyslog=yes
803fb7
 #ForwardToKMsg=no
803fb7
 #ForwardToConsole=no
803fb7
 #ForwardToWall=yes