logging: fill proper domain names at places where it is missing

also changed some error messages where it was not explicit

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2346 (Log message enhancements in GlusterFS - phase 1)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2346

4 files changed, 12 insertions, 12 deletions

diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index a44952487..67f7bcfa1 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -1050,7 +1050,7 @@ xdr_serialize_glusterfs_auth (char *dest, struct auth_glusterfs_parms *au)
                        XDR_ENCODE);
 
         if (!xdr_auth_glusterfs_parms (&xdr, au)) {
-                gf_log ("", GF_LOG_WARNING, "failed to encode auth glusterfs elements");
+                gf_log (THIS->name, GF_LOG_WARNING, "failed to encode auth glusterfs elements");
                 ret = -1;
                 goto ret;
         }
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 0ad579bc3..c9387e145 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -989,27 +989,27 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname, int po
 
         ret = dict_set_dynstr (dict, "remote-host", host);
         if (ret) {
-                gf_log ("", GF_LOG_WARNING, "failed to set remote-host with %s",
+                gf_log (THIS->name, GF_LOG_WARNING, "failed to set remote-host with %s",
                         host);
                 goto out;
         }
 
         ret = dict_set_int32 (dict, "remote-port", port);
         if (ret) {
-                gf_log ("", GF_LOG_WARNING, "failed to set remote-port with %d",
+                gf_log (THIS->name, GF_LOG_WARNING, "failed to set remote-port with %d",
                         port);
                 goto out;
         }
         ret = dict_set_str (dict, "transport.address-family", "inet");
         if (ret) {
-                gf_log ("", GF_LOG_WARNING,
+                gf_log (THIS->name, GF_LOG_WARNING,
                         "failed to set addr-family with inet");
                 goto out;
         }
 
         ret = dict_set_str (dict, "transport-type", "socket");
         if (ret) {
-                gf_log ("", GF_LOG_WARNING,
+                gf_log (THIS->name, GF_LOG_WARNING,
                         "failed to set trans-type with socket");
                 goto out;
         }
diff --git a/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c
index 567a78a43..fcf4617ca 100644
--- a/rpc/rpc-lib/src/rpcsvc-auth.c
+++ b/rpc/rpc-lib/src/rpcsvc-auth.c
@@ -348,7 +348,7 @@ rpcsvc_auth_unix_auxgids (rpcsvc_request_t *req, int *arrlen)
 
         if ((req->cred.flavour != AUTH_UNIX) ||
             (req->cred.flavour != AUTH_GLUSTERFS)) {
-                gf_log ("", GF_LOG_DEBUG, "auth type not unix or glusterfs");
+                gf_log ("rpc", GF_LOG_DEBUG, "auth type not unix or glusterfs");
                 return NULL;
         }
 
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 681064d79..674259e5f 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -375,7 +375,7 @@ __socket_nodelay (int fd)
         ret = setsockopt (fd, IPPROTO_TCP, TCP_NODELAY,
                           &on, sizeof (on));
         if (!ret)
-                gf_log ("", GF_LOG_TRACE,
+                gf_log (THIS->name, GF_LOG_TRACE,
                         "NODELAY enabled for socket %d", fd);
 
         return ret;
@@ -429,7 +429,7 @@ __socket_keepalive (int fd, int keepalive_intvl, int keepalive_idle)
 #endif
 
 done:
-        gf_log ("", GF_LOG_TRACE, "Keep-alive enabled for socket %d, interval "
+        gf_log (THIS->name, GF_LOG_TRACE, "Keep-alive enabled for socket %d, interval "
                 "%d, idle: %d", fd, keepalive_intvl, keepalive_idle);
 
 err:
@@ -1323,7 +1323,7 @@ __socket_read_reply (rpc_transport_t *this)
                 pthread_mutex_lock (&priv->lock);
 
                 if (ret == -1) {
-                        gf_log ("", GF_LOG_WARNING,
+                        gf_log (this->name, GF_LOG_WARNING,
                                 "notify for event MAP_XID failed");
                         goto out;
                 }
@@ -1577,7 +1577,7 @@ __socket_proto_state_machine (rpc_transport_t *this,
                                 priv->incoming.iobuf = NULL;
 
                                 if (*pollin == NULL) {
-                                        gf_log ("", GF_LOG_WARNING,
+                                        gf_log (this->name, GF_LOG_WARNING,
                                                 "transport pollin allocation failed");
                                         ret = -1;
                                         goto out;
@@ -1900,7 +1900,7 @@ socket_server_event_handler (int fd, int idx, void *data,
                         }
                         pthread_mutex_unlock (&new_priv->lock);
                         if (ret == -1) {
-                                gf_log ("", GF_LOG_WARNING,
+                                gf_log (this->name, GF_LOG_WARNING,
                                         "failed to register the socket with event");
                                 goto unlock;
                         }
@@ -2092,7 +2092,7 @@ socket_connect (rpc_transport_t *this, int port)
                 priv->idx = event_register (ctx->event_pool, priv->sock,
                                             socket_event_handler, this, 1, 1);
                 if (priv->idx == -1) {
-                        gf_log ("", GF_LOG_WARNING,
+                        gf_log (this->name, GF_LOG_WARNING,
                                 "failed to register the event");
                         ret = -1;
                 }