cluster: STABLE32 - Replace printf and fprintf calls with logt_print in the dlm locking module.

Ryan McCabe rmccabe at fedoraproject.org
Tue May 1 13:43:48 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2e191d461d982b78b030227a402a847152731304
Commit:        2e191d461d982b78b030227a402a847152731304
Parent:        124c727e34a946a248af0b8a47e7a2f0d52bd50e
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Fri Apr 27 18:30:54 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Fri Apr 27 18:30:54 2012 -0400

Replace printf and fprintf calls with logt_print in the dlm locking module.

Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
 rgmanager/src/clulib/dlm_lock.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rgmanager/src/clulib/dlm_lock.c b/rgmanager/src/clulib/dlm_lock.c
index d3f4250..0752b41 100644
--- a/rgmanager/src/clulib/dlm_lock.c
+++ b/rgmanager/src/clulib/dlm_lock.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 #include <sys/select.h>
 #include <pthread.h>
+#include <logging.h>
 
 /* Default lockspace stuff */
 static dlm_lshandle_t _default_ls = NULL;
@@ -50,9 +51,8 @@ clu_ls_lock(dlm_lshandle_t ls,
         int ret;
 
 	if (!ls || !lksb || !resource || !strlen(resource)) {
-		printf("%p %p %p %d\n", ls, lksb, resource,
-		       (int)strlen(resource));
-		printf("INVAL...\n");
+		logt_print(LOG_DEBUG, "Invalid lock request: %p %p %p %d\n",
+			ls, lksb, resource, resource ? strlen(resource) : 0);
 		errno = EINVAL;
 		return -1;
 	}
@@ -69,8 +69,8 @@ clu_ls_lock(dlm_lshandle_t ls,
         }
 
         if ((ret = (wait_for_dlm_event(ls) < 0))) {
-                fprintf(stderr, "wait_for_dlm_event: %d / %d\n",
-                        ret, errno);
+				logt_print(LOG_DEBUG, "wait_for_dlm_event: %d / %d\n",
+					ret, errno);
                 return -1;
         }
 
@@ -108,7 +108,7 @@ clu_open_lockspace(const char *lsname)
                 if (errno == ENOENT)
                         continue;
 
-                fprintf(stderr, "failed acquiring lockspace: %s\n",
+                logt_print(LOG_DEBUG, "failed acquiring lockspace: %s\n",
                         strerror(errno));
 
                 return NULL;


More information about the cluster-commits mailing list