Author: markt
Date: Wed Sep 14 10:42:23 2016
New Revision: 1760669
URL: http://svn.apache.org/viewvc?rev=1760669&view=rev
Log:
Correct an off-by-one error in the log messages for the number of attempts made
to communicate with the backend server.
Patch provided by Hiroto Shimizu.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1760669&r1=1760668&r2=1760669&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Sep 14 10:42:23 2016
@@ -1650,7 +1650,7 @@ static int JK_METHOD service(jk_endpoint
jk_log(l, JK_LOG_INFO,
"All tomcat instances failed, no more workers "
"left for recovery (attempt=%d, retry=%d)",
- attempt, retry);
+ attempt + 1, retry);
*is_error = JK_HTTP_SERVER_BUSY;
rc = JK_FALSE;
}
@@ -1659,7 +1659,7 @@ static int JK_METHOD service(jk_endpoint
jk_log(l, JK_LOG_INFO,
"All tomcat instances failed, no more workers "
"left (attempt=%d, retry=%d)",
- attempt, retry);
+ attempt + 1, retry);
*is_error = JK_HTTP_SERVER_BUSY;
rc = JK_FALSE;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1760669&r1=1760668&r2=1760669&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Sep 14 10:42:23 2016
@@ -81,9 +81,15 @@
Reiter. (markt)
</fix>
<fix>
+ <bug>58895</bug>: Correct an off-by-one error in the log messages for
+ the number of attempts made to communicate with the backend server.
+ Patch provided by Hiroto Shimizu. (markt)
+ </fix>
+ <fix>
<bug>59164</bug>: Fix crash on first connection if a host name is
specified for the worker that cannot be resolved to an IP address.
(markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
