Author: mturk
Date: Fri Sep 8 01:26:23 2006
New Revision: 441429
URL: http://svn.apache.org/viewvc?view=rev&rev=441429
Log:
Reset service loop in case we have forced recovery.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=441429&r1=441428&r2=441429
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Fri Sep 8 01:26:23
2006
@@ -863,7 +863,7 @@
* Client error !!!
* Since this is bad request do not fail over.
*/
- rec->s->errors++;
+ rec->s->client_errors++;
rec->s->state = JK_LB_STATE_OK;
rec->s->error_time = 0;
if (p->worker->lblock == JK_LB_LOCK_PESSIMISTIC)
@@ -966,8 +966,14 @@
jk_shm_unlock();
if (nf) {
+ /* We have forced recovery.
+ * Reset the service loop and go again
+ */
+ prec = NULL;
+ rc = -1;
jk_log(l, JK_LOG_INFO,
- "Forcing recovery on first attempt for %d workers",
nf);
+ "Forcing recovery on first attempt for %d workers",
nf);
+ continue;
}
else {
/* No workers in error state.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
