call-stub,circ-buff,client_t,compat,dict/libglusterfs : Porting to a new logging framework

Change-Id: Ie7d180e0ab2fed1270d66504606d1b2522884020
BUG: 1194640
Signed-off-by: Mohamed Ashiq <ashiq333@gmail.com>
Reviewed-on: http://review.gluster.org/10828
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

1 files changed, 30 insertions, 28 deletions

diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c
index 0538a3298cb..e50f27bff90 100644
--- a/libglusterfs/src/compat.c
+++ b/libglusterfs/src/compat.c
@@ -25,6 +25,7 @@
 #include "iatt.h"
 #include "inode.h"
 #include "run.h"
+#include "libglusterfs-messages.h"
 
 #ifdef GF_SOLARIS_HOST_OS
 int
@@ -41,9 +42,9 @@ solaris_fsetxattr(int fd, const char* key, const char *value, size_t size,
                 close (attrfd);
         } else {
                 if (errno != ENOENT)
-                        gf_log ("libglusterfs", GF_LOG_ERROR,
-                                "Couldn't set extended attribute for %d (%d)",
-                                fd, errno);
+                        gf_msg ("libglusterfs", GF_LOG_ERROR, errno,
+                                LG_MSG_SET_ATTRIBUTE_FAILED, "Couldn't set "
+                                "extended attribute for %d", fd);
                 return -1;
         }
 
@@ -69,9 +70,9 @@ solaris_fgetxattr(int fd, const char* key, char *value, size_t size)
                 close (attrfd);
         } else {
                 if (errno != ENOENT)
-                        gf_log ("libglusterfs", GF_LOG_INFO,
-                                "Couldn't read extended attribute for the file %d (%d)",
-                                fd, errno);
+                        gf_msg ("libglusterfs", GF_LOG_INFO, errno,
+                                LG_MSG_READ_ATTRIBUTE_FAILED, "Couldn't read "
+                                "extended attribute for the file %d", fd);
                 if (errno == ENOENT)
                         errno = ENODATA;
                 return -1;
@@ -168,7 +169,7 @@ solaris_xattr_resolve_path (const char *real_path, char **path)
                 if (lstat (export_path, &statbuf)) {
                         ret = mkdir (export_path, 0777);
                         if (ret && (errno != EEXIST)) {
-                                gf_log (THIS->name, GF_LOG_DEBUG, "mkdir failed,"
+                                gf_msg_debug (THIS->name, 0, "mkdir failed,"
                                         " errno: %d", errno);
                                 goto out;
                         }
@@ -182,9 +183,9 @@ solaris_xattr_resolve_path (const char *real_path, char **path)
                 if (ret) {
                         ret = mknod (xattr_path, S_IFREG|O_WRONLY, 0);
                         if (ret && (errno != EEXIST)) {
-                                gf_log (THIS->name, GF_LOG_WARNING,"Failed to create "
-                                        "mapped file %s, error %d", xattr_path,
-                                        errno);
+                                gf_msg (THIS->name, GF_LOG_WARNING, errno,
+                                        LG_MSG_FILE_OP_FAILED, "Failed to "
+                                        "create mapped file %s", xattr_path);
                                 goto out;
                         }
                 }
@@ -220,9 +221,9 @@ solaris_setxattr(const char *path, const char* key, const char *value,
                 ret = 0;
         } else {
                 if (errno != ENOENT)
-                        gf_log ("libglusterfs", GF_LOG_ERROR,
-                                "Couldn't set extended attribute for %s (%d)",
-                                path, errno);
+                        gf_msg ("libglusterfs", GF_LOG_ERROR, errno,
+                                LG_MSG_SET_ATTRIBUTE_FAILED, "Couldn't set "
+                                "extended attribute for %s", path);
                 ret = -1;
         }
         GF_FREE (mapped_path);
@@ -406,9 +407,9 @@ solaris_getxattr(const char *path,
                 close (attrfd);
         } else {
                 if (errno != ENOENT)
-                        gf_log ("libglusterfs", GF_LOG_INFO,
-                                "Couldn't read extended attribute for the file %s (%s)",
-                                path, strerror (errno));
+                        gf_msg ("libglusterfs", GF_LOG_INFO, errno,
+                                LG_MSG_READ_ATTRIBUTE_FAILED, "Couldn't read "
+                                "extended attribute for the file %s", path);
                 if (errno == ENOENT)
                         errno = ENODATA;
                 ret = -1;
@@ -472,14 +473,16 @@ int solaris_unlink (const char *path)
 
         if (!ret && mapped_path) {
                 if (lstat(path, &stbuf)) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "Stat failed on mapped"
-                                " file %s with error %d", mapped_path, errno);
+                        gf_msg (THIS->name, GF_LOG_WARNING, errno,
+                                LG_MSG_FILE_OP_FAILED, "Stat failed on "
+                                "mapped file %s", mapped_path);
                         goto out;
                 }
                 if (stbuf.st_nlink == 1) {
                         if(remove (mapped_path))
-                                gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "
-                                        "file %s. Errno %d", mapped_path, errno);
+                                gf_msg (THIS->name, GF_LOG_WARNING, errno,
+                                        LG_MSG_FILE_OP_FAILED, "Failed to "
+                                        "remove mapped file %s", mapped_path);
                 }
 
         }
@@ -501,8 +504,9 @@ solaris_rename (const char *old_path, const char *new_path)
 
         if (!ret && mapped_path) {
                 if (!remove (mapped_path))
-                        gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "
-                                "file %s. Errno %d", mapped_path, errno);
+                        gf_msg (THIS->name, GF_LOG_WARNING, errno,
+                                LG_MSG_FILE_OP_FAILED, "Failed to remove "
+                                "mapped file %s.", mapped_path);
                 GF_FREE (mapped_path);
         }
 
@@ -560,18 +564,16 @@ gf_umount_lazy (char *xlname, char *path, int rmdir_flag)
 #endif
         ret = runner_run (&runner);
         if (ret) {
-                gf_log (xlname, GF_LOG_ERROR,
-                        "Lazy unmount of %s failed: %s",
-                        path, strerror (errno));
+                gf_msg (xlname, GF_LOG_ERROR, errno, LG_MSG_UNMOUNT_FAILED,
+                        "Lazy unmount of %s", path);
         }
 
 #ifdef GF_LINUX_HOST_OS
         if (!ret && rmdir_flag) {
                 ret = rmdir (path);
                 if (ret)
-                         gf_log (xlname, GF_LOG_WARNING,
-                                 "rmdir %s failed: %s",
-                                 path, strerror (errno));
+                        gf_msg (xlname, GF_LOG_WARNING, errno,
+                                LG_MSG_DIR_OP_FAILED, "rmdir %s", path);
         }
 #endif