mturk 2005/02/21 09:10:00
Modified: jk/native/common jk_lb_worker.c
Log:
Revert the latest patch. The factor is already calculated.
What was missnig was the lbmethod check.
Revision Changes Path
1.66 +3 -18 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- jk_lb_worker.c 21 Feb 2005 17:02:50 -0000 1.65
+++ jk_lb_worker.c 21 Feb 2005 17:10:00 -0000 1.66
@@ -204,22 +204,6 @@
if (strcmp(p->lb_workers[i].s->name, name) == 0) {
rc = &p->lb_workers[i];
rc->r = &(rc->s->name[0]);
- if (!JK_WORKER_IN_ERROR(rc->s) &&
- p->lbmethod == JK_LB_BYREQUESTS) {
- unsigned int j;
- int total_factor = 0;
- for (j = 0; j < p->num_of_workers; j++) {
- if (JK_WORKER_USABLE(p->lb_workers[i].s) &&
- strlen(rc->s->domain) &&
- (strlen(p->lb_workers[i].s->domain) == 0 ||
- strcmp(p->lb_workers[i].s->domain, rc->s->domain)))
- continue;
- p->lb_workers[i].s->lb_value +=
p->lb_workers[i].s->lb_factor;
- total_factor += p->lb_workers[i].s->lb_factor;
- }
- rc->s->lb_value -= total_factor;
- }
-
break;
}
}
@@ -398,7 +382,8 @@
candidate = NULL;
}
}
- if (candidate && !uses_domain) {
+ if (candidate && !uses_domain &&
+ p->lbmethod == JK_LB_BYREQUESTS) {
for (i = 0; i < p->num_of_workers; i++) {
if (JK_WORKER_USABLE(p->lb_workers[i].s)) {
/* Skip all workers that are not member of candidate domain
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
