From 949dacab664dad9696f6107e8f363897ebbcc691 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 1 Sep 2011 14:08:22 +1000 Subject: [PATCH] LOG: fix the default syslog filter (#734984) Signed-off-by: Angus Salkeld --- 0001-LOG-fix-the-default-syslog-filter.patch | 31 ++++++++++++++++++++ libqb.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-LOG-fix-the-default-syslog-filter.patch diff --git a/0001-LOG-fix-the-default-syslog-filter.patch b/0001-LOG-fix-the-default-syslog-filter.patch new file mode 100644 index 0000000..75efdff --- /dev/null +++ b/0001-LOG-fix-the-default-syslog-filter.patch @@ -0,0 +1,31 @@ +From 9df0c323981d8e42e02ef1a215ce2fc6927c057e Mon Sep 17 00:00:00 2001 +From: Angus Salkeld +Date: Thu, 1 Sep 2011 13:49:48 +1000 +Subject: [PATCH] LOG: fix the default syslog filter + +Signed-off-by: Angus Salkeld +--- + lib/log.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/log.c b/lib/log.c +index d931249..2997eac 100644 +--- a/lib/log.c ++++ b/lib/log.c +@@ -627,11 +627,11 @@ qb_log_init(const char *name, int32_t facility, uint8_t priority) + snprintf(conf[QB_LOG_BLACKBOX].name, PATH_MAX, "%s-blackbox", name); + + logger_inited = QB_TRUE; ++ (void)qb_log_syslog_open(&conf[QB_LOG_SYSLOG]); ++ _log_target_state_set(&conf[QB_LOG_SYSLOG], QB_LOG_STATE_ENABLED); + (void)qb_log_filter_ctl(QB_LOG_SYSLOG, QB_LOG_FILTER_ADD, + QB_LOG_FILTER_FILE, "*", priority); + +- (void)qb_log_syslog_open(&conf[QB_LOG_SYSLOG]); +- _log_target_state_set(&conf[QB_LOG_SYSLOG], QB_LOG_STATE_ENABLED); + } + + void +-- +1.7.6.1 + diff --git a/libqb.spec b/libqb.spec index 7a9f7d1..6453c46 100644 --- a/libqb.spec +++ b/libqb.spec @@ -1,6 +1,6 @@ Name: libqb Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An IPC library for high performance servers Group: System Environment/Libraries @@ -9,6 +9,8 @@ URL: http://www.libqb.org Source0: https://fedorahosted.org/releases/q/u/quarterback/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: 0001-LOG-fix-the-default-syslog-filter.patch + BuildRequires: libtool doxygen procps check-devel #Requires: @@ -20,6 +22,8 @@ Initially these are IPC and poll. %prep %setup -q +%patch1 -p1 + %build %configure --disable-static make %{?_smp_mflags} @@ -63,6 +67,9 @@ developing applications that use %{name}. %{_mandir}/man3/qb*3* %changelog +* Thu Sep 1 2011 Angus Salkeld - 0.6.0-2 +- LOG: fix the default syslog filter + * Tue Aug 30 2011 Angus Salkeld - 0.6.0-1 - Rebased to 0.6.0 which includes (#734457): - Add a stop watch