Attachment 293183 Details for Bug 289521 – Fix

[patch] Fix

rgmanager-289521.patch (text/plain), 1.21 KB, created by Lon Hohberger on 2008-01-28 19:32:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-01-28 19:32:36 UTC

Size: 1.21 KB

patch

obsolete

>? clubufflush
>? clufindhostname
>? clulog
>? clunfslock
>? clustat
>? clusvcadm
>Index: clulog.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clulog.c,v
>retrieving revision 1.1.2.4
>diff -u -r1.1.2.4 clulog.c
>--- clulog.c	28 Jan 2008 19:27:20 -0000	1.1.2.4
>+++ clulog.c	28 Jan 2008 19:32:20 -0000
>@@ -33,7 +33,6 @@
> 
> int configure_logging(int);
> 
>-
> #define MAX_TOKENLEN   64
> 
> void
>@@ -54,10 +53,10 @@
> 	char *v;
> 	char internal = 0;
> 
>-	if (ccsfd < 0) {
>+	if (ccsfd == -1) {
> 		internal = 1;
> 		ccsfd = ccs_connect();
>-		if (ccsfd < 0)
>+		if (ccsfd == -1)
> 			return -1;
> 	}
> 
>@@ -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);

Actions: View | Diff

Attachments on bug 289521: 293183 | 293184