[Cluster-devel] cluster/rgmanager/src/utils clulog.c

[Cluster-devel] cluster/rgmanager/src/utils clulog.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2006-08-18 20:35:14

Modified files:
	rgmanager/src/utils: clulog.c 

Log message:
	Fix mixup noted in 200776, but use LOG_INFO (as defined in clulog.h) as default rather than switching to notice so as not to change the actual behavior

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clulog.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.1&r2=1.1.2.2

--- cluster/rgmanager/src/utils/clulog.c	2005/12/06 18:43:48	1.1.2.1
+++ cluster/rgmanager/src/utils/clulog.c	2006/08/18 20:35:14	1.1.2.2
@@ -35,7 +35,6 @@
 
 
 #define MAX_TOKENLEN   64
-#define DFLT_LOGLEVEL  LOG_NOTICE   /* taken from msgsvc.h */
 
 void
 usage(char *progname)
@@ -131,7 +130,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);

[Cluster-devel] cluster/rgmanager/src/utils clulog.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	lhh at sourceware.org	2006-08-18 20:35:40

Modified files:
	rgmanager/src/utils: clulog.c 

Log message:
	Fix mixup noted in 200776, but use LOG_INFO (as defined in clulog.h) as default rather than switching to notice so as not to change the actual behavior

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clulog.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.8.1&r2=1.1.8.2

--- cluster/rgmanager/src/utils/clulog.c	2005/12/06 18:43:45	1.1.8.1
+++ cluster/rgmanager/src/utils/clulog.c	2006/08/18 20:35:40	1.1.8.2
@@ -35,7 +35,6 @@
 
 
 #define MAX_TOKENLEN   64
-#define DFLT_LOGLEVEL  LOG_NOTICE   /* taken from msgsvc.h */
 
 void
 usage(char *progname)
@@ -131,7 +130,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);

[Cluster-devel] cluster/rgmanager/src/utils clulog.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-11-14 16:52:47

Modified files:
	rgmanager/src/utils: clulog.c 

Log message:
	Fix #289501 - make clulog honor rgmanager log levels

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clulog.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.1&r2=1.3.2.2

--- cluster/rgmanager/src/utils/clulog.c	2007/05/10 16:23:44	1.3.2.1
+++ cluster/rgmanager/src/utils/clulog.c	2007/11/14 16:52:47	1.3.2.2
@@ -92,9 +92,6 @@
     if (argc < 4)
 	usage(argv[0]);
 
-    /* ../daemons/log.c */
-    configure_logging(-1);
-
     while ((opt = getopt(argc, argv, "f:l:s:hp:n:")) != -1) {
 	switch (opt) {
 	case 'l':
@@ -133,9 +130,10 @@
     if (!cmdline_loglevel) {
 	/*
 	 * Let's see what loglevel the SM is running at.
-	 * TODO Get rgmgr log level
+	 * If ccsd's not available, use default.
 	 */
-	clu_set_loglevel(LOGLEVEL_DFLT);
+    	if (configure_logging(-1) < 0)
+		clu_set_loglevel(LOGLEVEL_DFLT);
     }
     result = clulog_pid(severity, pid, progname, logmsg);
     free(progname);

[Cluster-devel] cluster/rgmanager/src/utils clulog.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2008-01-28 19:34:32

Modified files:
	rgmanager/src/utils: clulog.c 

Log message:
	Fix #289521 - clulog not respecting rgmanager log level

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clulog.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.4&r2=1.1.2.5

--- cluster/rgmanager/src/utils/clulog.c	2008/01/28 19:27:20	1.1.2.4
+++ cluster/rgmanager/src/utils/clulog.c	2008/01/28 19:34:32	1.1.2.5
@@ -33,7 +33,6 @@
 
 int configure_logging(int);
 
-
 #define MAX_TOKENLEN   64
 
 void
@@ -93,9 +92,6 @@
     if (argc < 4)
 	usage(argv[0]);
 
-    /* ../daemons/log.c */
-    configure_logging(-1);
-
     while ((opt = getopt(argc, argv, "f:l:s:hp:n:")) != -1) {
 	switch (opt) {
 	case 'l':
@@ -134,9 +130,10 @@
     if (!cmdline_loglevel) {
 	/*
 	 * Let's see what loglevel the SM is running at.
-	 * TODO Get rgmgr log level
+	 * If ccsd's not available, use default.
 	 */
-	clu_set_loglevel(LOGLEVEL_DFLT);
+    	if (configure_logging(-1) < 0)
+		clu_set_loglevel(LOGLEVEL_DFLT);
     }
     result = clulog_pid(severity, pid, progname, logmsg);
     free(progname);