Author: rjung
Date: Tue Mar 10 00:13:30 2009
New Revision: 751916
URL: http://svn.apache.org/viewvc?rev=751916&view=rev
Log:
Add new attribute error_escalation_time to structures,
initialize and add to pull and push.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_shm.h
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?rev=751916&r1=751915&r2=751916&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Tue Mar 10 00:13:30
2009
@@ -297,6 +297,7 @@
p->sticky_session = p->s->sticky_session;
p->sticky_session_force = p->s->sticky_session_force;
p->recover_wait_time = p->s->recover_wait_time;
+ p->error_escalation_time = p->s->error_escalation_time;
p->max_reply_timeouts = p->s->max_reply_timeouts;
p->retries = p->s->retries;
p->retry_interval = p->s->retry_interval;
@@ -351,6 +352,7 @@
p->s->sticky_session = p->sticky_session;
p->s->sticky_session_force = p->sticky_session_force;
p->s->recover_wait_time = p->recover_wait_time;
+ p->s->error_escalation_time = p->error_escalation_time;
p->s->max_reply_timeouts = p->max_reply_timeouts;
p->s->retries = p->retries;
p->s->retry_interval = p->retry_interval;
@@ -1640,6 +1642,8 @@
WAIT_BEFORE_RECOVER);
if (p->recover_wait_time < 1)
p->recover_wait_time = 1;
+ p->error_escalation_time = jk_get_worker_error_escalation_time(props,
p->name,
+
p->recover_wait_time / 2);
p->max_reply_timeouts = jk_get_worker_max_reply_timeouts(props, p->name,
0);
p->maintain_time = jk_get_worker_maintain_time(props);
@@ -1759,6 +1763,7 @@
private_data->worker.destroy = destroy;
private_data->worker.maintain = maintain_workers;
private_data->recover_wait_time = WAIT_BEFORE_RECOVER;
+ private_data->error_escalation_time = private_data->recover_wait_time
/ 2;
private_data->max_reply_timeouts = 0;
private_data->sequence = 0;
private_data->s->h.sequence = 0;
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=751916&r1=751915&r2=751916&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Tue Mar 10 00:13:30
2009
@@ -183,6 +183,7 @@
int sticky_session;
int sticky_session_force;
int recover_wait_time;
+ int error_escalation_time;
int max_reply_timeouts;
int retries;
int retry_interval;
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=751916&r1=751915&r2=751916&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Tue Mar 10 00:13:30 2009
@@ -165,6 +165,7 @@
int sticky_session;
int sticky_session_force;
int recover_wait_time;
+ int error_escalation_time;
int max_reply_timeouts;
int retries;
int retry_interval;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
