pool/corosync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 461232 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/461232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2017-03-03 13:38:23 +00:00 committed by Git OBS Bridge
commit 9ccfe7bfb5
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-Logsys-Change-logsys-syslog_priority-priority.patch Normal file
View File

@ -0,0 +1,38 @@
From 8b6bd86a55b8bda9f3a8ff67bdff908263976fa3 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
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 <jfriesse@redhat.com>
---
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

7
corosync.changes
View File

@ -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

4
corosync.spec
View File

@ -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}