mturk 2005/05/19 03:14:29
Modified: jk/native/common jk_ajp_common.c
Log:
Change the log level for cping/cpong failrue. Those messages
are informative rather then error.
No functional change.
Revision Changes Path
1.118 +10 -8
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- jk_ajp_common.c 18 May 2005 18:04:53 -0000 1.117
+++ jk_ajp_common.c 19 May 2005 10:14:29 -0000 1.118
@@ -781,7 +781,7 @@
rc = select(ae->sd + 1, &rset, NULL, &eset, &tv);
if ((rc < 0) || (FD_ISSET(ae->sd, &eset))) {
- jk_log(l, JK_LOG_ERROR,
+ jk_log(l, JK_LOG_WARNING,
"error during select [%d]", rc);
return JK_FALSE;
}
@@ -815,7 +815,7 @@
/* wait for Pong reply for timeout milliseconds
*/
if (ajp_is_input_event(ae, timeout, l) == JK_FALSE) {
- jk_log(l, JK_LOG_ERROR, "timeout in reply pong");
+ jk_log(l, JK_LOG_INFO, "timeout in reply pong");
JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -830,7 +830,7 @@
}
if ((cmd = jk_b_get_byte(msg)) != AJP13_CPONG_REPLY) {
- jk_log(l, JK_LOG_ERROR,
+ jk_log(l, JK_LOG_INFO,
"awaited reply cpong, received %d instead",
cmd);
JK_TRACE_EXIT(l);
@@ -853,10 +853,12 @@
ae->worker->socket_timeout,
ae->worker->socket_buf, l);
if (ae->sd >= 0) {
- jk_log(l, JK_LOG_DEBUG,
- "Connected socket %d to (%s)",
- ae->sd, jk_dump_hinfo(&ae->worker->worker_inet_addr, buf));
-
+ if (JK_IS_DEBUG_LEVEL(l)) {
+ jk_log(l, JK_LOG_DEBUG,
+ "Connected socket %d to (%s)",
+ ae->sd,
+ jk_dump_hinfo(&ae->worker->worker_inet_addr, buf));
+ }
/* set last_access only if needed */
if (ae->worker->cache_timeout > 0 || ae->worker->recycle_timeout > 0)
ae->last_access = time(NULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
