anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch

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