[Cluster-devel] cluster/rgmanager/src/utils clulog.c
lhh at sourceware.org
lhh at sourceware.org
Mon Jan 28 19:34:32 UTC 2008
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);
More information about the Cluster-devel
mailing list