From 7c5882b7baee11f060b73e7c6ea58d86485e962f Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Tue, 15 Nov 2011 11:34:44 +0100 Subject: [PATCH] Revert "Log host name on number of connections" attempt to log host+port on num connection since it's per host. This reverts commit f6a03dd10715f8539a4f37c8b74c7d616cabd638. --- src/connection.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/connection.c b/src/connection.c index 4be296f..1c7d467 100644 --- a/src/connection.c +++ b/src/connection.c @@ -261,7 +261,6 @@ static void non_block_events(struct connection *co) default: yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", ev, client_get_id(cl)); - break; } } if (got_records) @@ -574,21 +573,21 @@ int client_prep_connection(struct client *cl, } if (co) { - yaz_log(YLOG_LOG, "Host %s: num_connections = %d (reusing)", host->hostport, num_connections); + yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections); break; } } if (max_connections <= 0 || num_connections < max_connections) { - yaz_log(YLOG_LOG, "Host %s: num_connections = %d (new); max = %d", - host->hostport, num_connections, max_connections); + yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d", + num_connections, max_connections); break; } - yaz_log(YLOG_LOG, "Host %s: num_connections = %d (waiting) max = %d", - host->hostport, num_connections, max_connections); + yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d", + num_connections, max_connections); if (yaz_cond_wait(host->cond_ready, host->mutex, abstime)) { - yaz_log(YLOG_LOG, "Host %s: out of connections %s", host->hostport, client_get_id(cl)); + yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl)); client_set_state(cl, Client_Error); yaz_mutex_leave(host->mutex); return 0; @@ -596,7 +595,7 @@ int client_prep_connection(struct client *cl, } if (co) { - yaz_log(YLOG_LOG, "Host %s: %p Connection reuse. state: %d", host->hostport, co, co->state); + yaz_log(YLOG_LOG, "%p Connection reuse. state: %d", co, co->state); connection_release(co); client_set_connection(cl, co); co->client = cl; @@ -613,9 +612,8 @@ int client_prep_connection(struct client *cl, else { yaz_mutex_leave(host->mutex); - co = connection_create(cl, host, operation_timeout, session_timeout, iochan_man); - yaz_log(YLOG_LOG, "Host %s: %p Connection new", host->hostport, co); - + co = connection_create(cl, host, operation_timeout, session_timeout, + iochan_man); } assert(co->host); } -- 1.7.10.4