Author: rjung
Date: Thu Jan 22 09:56:37 2015
New Revision: 1653794
URL: http://svn.apache.org/r1653794
Log:
Correct log message "all endpoints are disconnected" to
"no usable connection found, will create a new one".
Tone done from info log level to debug for the
common case.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
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=1653794&r1=1653793&r2=1653794&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Thu Jan 22 09:56:37 2015
@@ -1687,16 +1687,22 @@ static int ajp_send_request(jk_endpoint_
*/
if (!IS_VALID_SOCKET(ae->sd)) {
/* Could not steal any connection from an endpoint - backend
- * is disconnected
+ * is disconnected or all connections are in use
*/
if (err_conn + err_cping + err_send > 0)
- jk_log(l, JK_LOG_INFO,
- "(%s) all endpoints are disconnected, "
- "detected by connect check (%d), cping (%d), send (%d)",
- ae->worker->name, err_conn, err_cping, err_send);
+ if (err_cping + err_send > 0)
+ jk_log(l, JK_LOG_INFO,
+ "(%s) no usable connection found, will create a new
one, "
+ "detected by connect check (%d), cping (%d), send
(%d).",
+ ae->worker->name, err_conn, err_cping, err_send);
+ else
+ jk_log(l, JK_LOG_DEBUG,
+ "(%s) no usable connection found, will create a new
one, "
+ "detected by connect check (%d), cping (%d), send
(%d).",
+ ae->worker->name, err_conn, err_cping, err_send);
else if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- "(%s) all endpoints are disconnected.",
+ "(%s) no usable connection found, will create a new one.",
ae->worker->name);
/* Connect to the backend.
*/
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1653794&r1=1653793&r2=1653794&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Jan 22 09:56:37 2015
@@ -205,6 +205,11 @@
allowed for a worker (attribute "busy_limit"). Original patch
contributed by zealot0630 at gmail dot com. (rjung)
</fix>
+ <fix>
+ Correct log message "all endpoints are disconnected" to
+ "no usable connection found, will create a new one". Tone done
+ from info log level to debug for the common case. (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
