|
 |
3062ca |
From c866a2f8603b44e89eb21a6cf7d88134af2e8b66 Mon Sep 17 00:00:00 2001
|
|
|
3062ca |
From: Bin Liu <bliu@suse.com>
|
|
|
3062ca |
Date: Fri, 10 Mar 2017 15:22:13 +0800
|
|
|
3062ca |
Subject: [PATCH] logconfig: Do not overwrite logger_subsys priority
|
|
|
3062ca |
|
|
|
3062ca |
logfile_priority and syslog_priority could be modified by
|
|
|
3062ca |
logging.logger_subsys.{logfile_priority|syslog_priority}. which could
|
|
|
3062ca |
lead to the following output(which are at notice level):
|
|
|
3062ca |
|
|
|
3062ca |
corosync[21419]: [QUORUM] Using quorum provider corosync_votequorum
|
|
|
3062ca |
corosync[21419]: [QUORUM] Members[1]: 1084777643
|
|
|
3062ca |
corosync[21419]: [QUORUM] This node is within the primary component
|
|
|
3062ca |
and will provide service.
|
|
|
3062ca |
corosync[21419]: [QUORUM] Members[3]: 1084777563 1084777584 1084777643
|
|
|
3062ca |
|
|
|
3062ca |
even the syslog_priority is warning. This patch could avoid the
|
|
|
3062ca |
overwrite.
|
|
|
3062ca |
|
|
|
3062ca |
Signed-off-by: Bin Liu <bliu@suse.com>
|
|
|
3062ca |
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
|
|
|
3062ca |
(cherry picked from commit d2a5e1442e970069d335ce3a8a67c3b9af352a34)
|
|
|
3062ca |
---
|
|
|
3062ca |
exec/logconfig.c | 4 ++--
|
|
|
3062ca |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
3062ca |
|
|
|
3062ca |
diff --git a/exec/logconfig.c b/exec/logconfig.c
|
|
|
3062ca |
index a4d348a..6d0bed6 100644
|
|
|
3062ca |
--- a/exec/logconfig.c
|
|
|
3062ca |
+++ b/exec/logconfig.c
|
|
|
3062ca |
@@ -401,7 +401,7 @@ static int corosync_main_config_set (
|
|
|
3062ca |
goto parse_error;
|
|
|
3062ca |
}
|
|
|
3062ca |
}
|
|
|
3062ca |
- else {
|
|
|
3062ca |
+ else if(strcmp(key_name, "logging.syslog_priority") == 0){
|
|
|
3062ca |
if (logsys_config_syslog_priority_set(subsys,
|
|
|
3062ca |
logsys_priority_id_get("info")) < 0) {
|
|
|
3062ca |
error_reason = "unable to set syslog level";
|
|
|
3062ca |
@@ -449,7 +449,7 @@ static int corosync_main_config_set (
|
|
|
3062ca |
goto parse_error;
|
|
|
3062ca |
}
|
|
|
3062ca |
}
|
|
|
3062ca |
- else {
|
|
|
3062ca |
+ else if(strcmp(key_name,"logging.logfile_priority") == 0){
|
|
|
3062ca |
if (logsys_config_logfile_priority_set(subsys,
|
|
|
3062ca |
logsys_priority_id_get("info")) < 0) {
|
|
|
3062ca |
error_reason = "unable to set syslog level";
|
|
|
3062ca |
--
|
|
|
3062ca |
1.7.1
|
|
|
3062ca |
|