From e6ce2d28fd3355f01b8e3f0364bcf0d9cdfafe41a384df41385d479ab06772a0 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Wed, 1 Mar 2017 02:46:00 +0000 Subject: [PATCH] Accepting request 460790 from home:BinLiu:branches:network:ha-clustering:Factory - L3-Question: corosync logging priority takes no effect(bsc#1023959) added: 0001-Logsys-Change-logsys-syslog_priority-priority.patch OBS-URL: https://build.opensuse.org/request/show/460790 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=79 --- ...ange-logsys-syslog_priority-priority.patch | 38 +++++++++++++++++++ corosync.changes | 7 ++++ corosync.spec | 4 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0001-Logsys-Change-logsys-syslog_priority-priority.patch diff --git a/0001-Logsys-Change-logsys-syslog_priority-priority.patch b/0001-Logsys-Change-logsys-syslog_priority-priority.patch new file mode 100644 index 0000000..c81c4f0 --- /dev/null +++ b/0001-Logsys-Change-logsys-syslog_priority-priority.patch @@ -0,0 +1,38 @@ +From 8b6bd86a55b8bda9f3a8ff67bdff908263976fa3 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Fri, 24 Feb 2017 16:23:50 +0100 +Subject: [PATCH] Logsys: Change logsys syslog_priority priority + +LibQB adds default "*" syslog filter so we have to set syslog_priority +as low as possible so filters applied later in +_logsys_config_apply_per_file takes effect. + +Signed-off-by: Jan Friesse +--- + exec/main.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/exec/main.c b/exec/main.c +index 61bcd3d..2370a86 100644 +--- a/exec/main.c ++++ b/exec/main.c +@@ -127,10 +127,15 @@ + #define IPC_LOGSYS_SIZE 8192*128 + #endif + ++/* ++ * LibQB adds default "*" syslog filter so we have to set syslog_priority as low ++ * as possible so filters applied later in _logsys_config_apply_per_file takes ++ * effect. ++ */ + LOGSYS_DECLARE_SYSTEM ("corosync", + LOGSYS_MODE_OUTPUT_STDERR | LOGSYS_MODE_OUTPUT_SYSLOG, + LOG_DAEMON, +- LOG_INFO); ++ LOG_EMERG); + + LOGSYS_DECLARE_SUBSYS ("MAIN"); + +-- +2.6.6 + diff --git a/corosync.changes b/corosync.changes index 03d70f9..33f8abe 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 28 04:52:04 UTC 2017 - bliu@suse.com + +- L3-Question: corosync logging priority takes no effect(bsc#1023959) + added: + 0001-Logsys-Change-logsys-syslog_priority-priority.patch + ------------------------------------------------------------------- Tue Dec 6 08:19:09 UTC 2016 - bliu@suse.com diff --git a/corosync.spec b/corosync.spec index 138e182..c665064 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,7 @@ # # spec file for package corosync # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,6 +60,7 @@ Patch5: corosync-2.3.4-fix-bashisms.patch Patch6: bsc#1001164-corosync.conf-example.patch Patch7: corosync-start-stop-level.patch Patch8: disable-build-html-docs.patch +Patch9: 0001-Logsys-Change-logsys-syslog_priority-priority.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not @@ -127,6 +128,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build %if %{with_runautogen}