dlm: master - dlm_controld: fix log_plock

David Teigland teigland at fedoraproject.org
Thu Jun 7 19:38:44 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=e7883bea402d425f176dc4176bf5123acc84e153
Commit:        e7883bea402d425f176dc4176bf5123acc84e153
Parent:        d1038d9e408fad4f6280b26b3f14366852a400ed
Author:        David Teigland <teigland at redhat.com>
AuthorDate:    Thu Jun 7 14:36:46 2012 -0500
Committer:     David Teigland <teigland at redhat.com>
CommitterDate: Thu Jun 7 14:36:46 2012 -0500

dlm_controld: fix log_plock

log_plock messages were using a level of 0, which was meant
to indicate "none", but instead meant LOG_EMERG.

Signed-off-by: David Teigland <teigland at redhat.com>
---
 dlm_controld/dlm_daemon.h |    3 ++-
 dlm_controld/logging.c    |   12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index aa31c82..7cb3c01 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -185,6 +185,7 @@ EXTERN struct fence_device fence_all_device;
 #define LOG_DUMP_SIZE DLMC_DUMP_SIZE
 
 #define LOG_PLOCK 0x00010000
+#define LOG_NONE  0x00001111
 
 void log_level(char *name_in, uint32_t level_in, const char *fmt, ...);
 
@@ -192,7 +193,7 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...);
 #define log_debug(fmt, args...) log_level(NULL, LOG_DEBUG, fmt, ##args)
 #define log_group(ls, fmt, args...) log_level((ls)->name, LOG_DEBUG, fmt, ##args)
 
-#define log_plock(ls, fmt, args...) log_level((ls)->name, LOG_PLOCK, fmt, ##args)
+#define log_plock(ls, fmt, args...) log_level((ls)->name, LOG_PLOCK|LOG_NONE, fmt, ##args)
 #define log_dlock(ls, fmt, args...) log_level((ls)->name, LOG_PLOCK|LOG_DEBUG, fmt, ##args)
 #define log_elock(ls, fmt, args...) log_level((ls)->name, LOG_PLOCK|LOG_ERR, fmt, ##args)
 
diff --git a/dlm_controld/logging.c b/dlm_controld/logging.c
index d31249d..9347e43 100644
--- a/dlm_controld/logging.c
+++ b/dlm_controld/logging.c
@@ -88,8 +88,8 @@ void copy_log_dump_plock(char *buf, int *len)
 	log_copy(buf, len, log_dump_plock, &log_point_plock, &log_wrap_plock);
 }
 
-static void log_save_str(int level, int len, char *log_buf,
-			 unsigned int *point, unsigned int *wrap)
+static void log_save_str(int len, char *log_buf, unsigned int *point,
+			 unsigned int *wrap)
 {
 	unsigned int p = *point;
 	unsigned int w = *wrap;
@@ -151,10 +151,10 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
 	log_str[pos++] = '\n';
 	log_str[pos++] = '\0';
 
-	if (level)
-		log_save_str(level, pos - 1, log_dump, &log_point, &log_wrap);
+	if (level < LOG_NONE)
+		log_save_str(pos - 1, log_dump, &log_point, &log_wrap);
 	if (plock)
-		log_save_str(level, pos - 1, log_dump_plock, &log_point_plock, &log_wrap_plock);
+		log_save_str(pos - 1, log_dump_plock, &log_point_plock, &log_wrap_plock);
 
 	if (level <= syslog_priority)
 		syslog(level, "%s", log_str);
@@ -170,7 +170,7 @@ void log_level(char *name_in, uint32_t level_in, const char *fmt, ...)
 	if (!dlm_options[daemon_debug_ind].use_int)
 		return;
 
-	if (level || (plock && opt(plock_debug_ind)))
+	if ((level < LOG_NONE) || (plock && opt(plock_debug_ind)))
 		fprintf(stderr, "%s", log_str);
 }
 


More information about the cluster-commits mailing list