Author: mturk
Date: Mon Dec 21 12:55:02 2009
New Revision: 892803
URL: http://svn.apache.org/viewvc?rev=892803&view=rev
Log:
Fix #48276. Just like with setting port to 0, if the resolve fails, mark the
worker as disabled
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=892803&r1=892802&r2=892803&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 21 12:55:02 2009
@@ -2575,6 +2575,13 @@
jk_log(l, JK_LOG_ERROR,
"worker %s can't resolve tomcat address %s",
p->name, p->host);
+ p->s->port = p->port = 0;
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "worker %s contact is disabled",
+ p->name);
+ JK_TRACE_EXIT(l);
+ return JK_TRUE;
}
else {
p->s->port = p->port = 0;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892803&r1=892802&r2=892803&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 12:55:02 2009
@@ -44,6 +44,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>48276</bug>: When worker contact cannot be resolved mark the
+ worker as disabled instead failing to start the server. (mturk)
+ </fix>
+ <fix>
<bug>48305</bug>: Status: Do not show secret property when
doing dump. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
