summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kp@gluster.com>2012-04-12 12:39:48 +0530
committerVijay Bellur <vijay@gluster.com>2012-04-13 00:59:14 -0700
commit362c5283ace6f048d0404a8a390faeb014ebe351 (patch)
treea5da4befef0e8122b149a4e6287f4f12fb80f50f
parent28f373d89fba7266473c952d9c2bf6ec5f02628c (diff)
server: Modified logging information to ease log based analysis
Change-Id: I1bde6505346b5dda37cf88c66f9af8ff48668ed9 BUG: 811864 Signed-off-by: Krishnan Parthasarathi <kp@gluster.com> Reviewed-on: http://review.gluster.com/3133 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com>
-rw-r--r--xlators/protocol/server/src/server-handshake.c4
-rw-r--r--xlators/protocol/server/src/server.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 920a73ffc8c..f9d79721eeb 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -567,7 +567,7 @@ server_setvolume (rpcsvc_request_t *req)
gf_log (this->name, GF_LOG_INFO,
"accepted client from %s (version: %s)",
- (peerinfo) ? peerinfo->identifier : "<>",
+ conn->id,
(clnt_version) ? clnt_version : "old");
op_ret = 0;
conn->bound_xl = xl;
@@ -578,7 +578,7 @@ server_setvolume (rpcsvc_request_t *req)
} else {
gf_log (this->name, GF_LOG_ERROR,
"Cannot authenticate client from %s %s",
- (peerinfo) ? peerinfo->identifier : "<>",
+ conn->id,
(clnt_version) ? clnt_version : "old");
op_ret = -1;
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index c54c34091d3..aa21df5e63a 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -673,7 +673,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event,
*/
pthread_mutex_lock (&conf->mutex);
{
- list_del (&xprt->list);
+ list_del_init (&xprt->list);
}
pthread_mutex_unlock (&conf->mutex);