Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 7760 invoked from network); 19 Nov 2004 15:31:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 19 Nov 2004 15:31:02 -0000 Received: (qmail 1153 invoked by uid 500); 19 Nov 2004 15:30:47 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 1137 invoked by uid 500); 19 Nov 2004 15:30:47 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 1122 invoked by uid 500); 19 Nov 2004 15:30:47 -0000 Received: (qmail 1118 invoked by uid 99); 19 Nov 2004 15:30:47 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 19 Nov 2004 07:30:45 -0800 Received: (qmail 7650 invoked by uid 1526); 19 Nov 2004 15:30:44 -0000 Date: 19 Nov 2004 15:30:44 -0000 Message-ID: <20041119153044.7649.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2004/11/19 07:30:44 Modified: jk/native/common jk_lb_worker.c Log: Added configurable WAIT_BEFORE_RECOVER param. The new directive is named "recover_time" and can be customized inside workers.properies. Revision Changes Path 1.31 +15 -4 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- jk_lb_worker.c 19 Nov 2004 12:58:18 -0000 1.30 +++ jk_lb_worker.c 19 Nov 2004 15:30:44 -0000 1.31 @@ -38,7 +38,7 @@ * Time to wait before retry... */ #define WAIT_BEFORE_RECOVER (60*1) -#define ADDITINAL_WAIT_LOAD (20) +#define WORKER_RECOVER_TIME ("recover_time") /** * Worker record should be inside shared @@ -72,7 +72,9 @@ int in_local_worker_mode; int local_worker_only; int sticky_session; + int recover_wait_time; }; + typedef struct lb_worker lb_worker_t; struct lb_endpoint @@ -244,7 +246,7 @@ if (!p->lb_workers[i].in_recovering) { time_t now = time(0); if ((now - p->lb_workers[i].error_time) > - WAIT_BEFORE_RECOVER) { + p->recover_wait_time) { p->lb_workers[i].in_recovering = JK_TRUE; p->lb_workers[i].error_time = now; rc = &(p->lb_workers[i]); @@ -495,10 +497,19 @@ jk_map_t *props, jk_worker_env_t *we, jk_logger_t *log) { + int i; lb_worker_t *p = (lb_worker_t *)pThis->worker_private; pThis->retries = jk_get_worker_retries(props, p->name, JK_RETRIES); + + if (jk_get_worker_int_prop(props, p->name, + WORKER_RECOVER_TIME, + &i)) + p->recover_wait_time = i; + if (p->recover_wait_time < WAIT_BEFORE_RECOVER) + p->recover_wait_time = WAIT_BEFORE_RECOVER; + return JK_TRUE; } @@ -571,7 +582,7 @@ private_data->worker.get_endpoint = get_endpoint; private_data->worker.destroy = destroy; private_data->worker.retries = JK_RETRIES; - + private_data->recover_wait_time = WAIT_BEFORE_RECOVER; *w = &private_data->worker; JK_TRACE_EXIT(l); return JK_TRUE; --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org