Author: mturk
Date: Fri Sep 17 13:39:19 2010
New Revision: 998124
URL: http://svn.apache.org/viewvc?rev=998124&view=rev
Log:
Unify socket descriptor logging
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=998124&r1=998123&r2=998124&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Sep 17 13:39:19 2010
@@ -755,8 +755,8 @@ static void ajp_reset_endpoint(ajp_endpo
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "(%s) resetting endpoint with sd = %u %s",
- ae->worker->name, ae->sd, ae->reuse? "" : "(socket shutdown)");
+ "(%s) resetting endpoint with socket %d%s",
+ ae->worker->name, ae->sd, ae->reuse? "" : " (socket shutdown)");
if (!ae->reuse) {
ajp_abort_endpoint(ae, JK_TRUE, l);
}
@@ -773,8 +773,8 @@ void ajp_close_endpoint(ajp_endpoint_t *
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "closing endpoint with sd = %u%s",
- ae->sd, ae->reuse ? "" : " (socket shutdown)");
+ "(%s) closing endpoint with socket %d%s",
+ ae->worker->name, ae->sd, ae->reuse ? "" : " (socket
shutdown)");
if (IS_VALID_SOCKET(ae->sd)) {
jk_shutdown_socket(ae->sd, l);
}
@@ -821,7 +821,7 @@ static int ajp_next_connection(ajp_endpo
ret = JK_TRUE;
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "(%s) Will try pooled connection sd = %d from slot %d",
+ "(%s) Will try pooled connection socket %d from slot
%d",
ae->worker->name, ae->sd, i);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
