[Cluster-devel] cluster/rgmanager ChangeLog include/clulog.h s ...

[Cluster-devel] cluster/rgmanager ChangeLog include/clulog.h s ...

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2006-08-18 20:33:24

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/include: clulog.h 
	rgmanager/src/utils: clulog.c 

Log message:
	Fix 200776 - mixed up default log level constants

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/include/clulog.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clulog.c.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- cluster/rgmanager/ChangeLog	2006/08/18 15:26:21	1.20
+++ cluster/rgmanager/ChangeLog	2006/08/18 20:33:24	1.21
@@ -10,6 +10,8 @@
 	* src/resources/clusterfs.sh, fs.sh, nfsclient.sh: Add proper
 	warning messages if status check fails
 	* src/resources/ra-api-1-modified.dtd: Allow 'migrate' option
+	* include/clulog.h, src/daemons/clulog.c: Fix default log levels so
+	that they're LOG_NOTICE, and only one default is used (#200776)
 
 2006-08-08 Lon Hohberger <lhh@redhat.com>
 	* src/clulib/members.c: Fix gained/lost list creation so that the
--- cluster/rgmanager/include/clulog.h	2005/12/06 18:43:41	1.4
+++ cluster/rgmanager/include/clulog.h	2006/08/18 20:33:24	1.5
@@ -38,7 +38,7 @@
 #include <syslog.h>
 #include <sys/types.h>
 
-#define LOGLEVEL_DFLT         LOG_INFO
+#define LOGLEVEL_DFLT         LOG_NOTICE
 #define MAX_LOGMSG_LEN        512
 
 /*
--- cluster/rgmanager/src/utils/clulog.c	2005/12/06 18:43:41	1.2
+++ cluster/rgmanager/src/utils/clulog.c	2006/08/18 20:33:24	1.3
@@ -33,9 +33,7 @@
 
 int configure_logging(int);
 
-
 #define MAX_TOKENLEN   64
-#define DFLT_LOGLEVEL  LOG_NOTICE   /* taken from msgsvc.h */
 
 void
 usage(char *progname)
@@ -131,7 +129,7 @@
 	 * Let's see what loglevel the SM is running at.
 	 * TODO Get rgmgr log level
 	 */
-	clu_set_loglevel(DFLT_LOGLEVEL);
+	clu_set_loglevel(LOGLEVEL_DFLT);
     }
     result = clulog_pid(severity, pid, progname, logmsg);
     free(progname);