mturk 2004/11/19 04:58:18
Modified: jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c
jk_ajp14_worker.c jk_jni_worker.c jk_lb_worker.c
Log:
Fix retries for worker adding initialization to 'init'.
Revision Changes Path
1.16 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_ajp12_worker.c 8 Nov 2004 13:23:01 -0000 1.15
+++ jk_ajp12_worker.c 19 Nov 2004 12:58:18 -0000 1.16
@@ -257,6 +257,7 @@
private_data->worker.init = init;
private_data->worker.get_endpoint = get_endpoint;
private_data->worker.destroy = destroy;
+ private_data->worker.retries = JK_RETRIES;
*w = &private_data->worker;
return JK_TRUE;
1.20 +7 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_ajp13_worker.c 11 Nov 2004 17:28:59 -0000 1.19
+++ jk_ajp13_worker.c 19 Nov 2004 12:58:18 -0000 1.20
@@ -43,7 +43,12 @@
jk_worker_env_t *we, jk_logger_t *l)
{
int rc;
+ ajp_worker_t *aw = ( ajp_worker_t *)pThis->worker_private;
JK_TRACE_ENTER(l);
+
+ pThis->retries = jk_get_worker_retries(props, aw->name,
+ JK_RETRIES);
+
rc = ajp_init(pThis, props, we, l, AJP13_PROTO);
JK_TRACE_EXIT(l);
return rc;
@@ -110,6 +115,7 @@
aw->worker.init = init;
aw->worker.get_endpoint = get_endpoint;
aw->worker.destroy = destroy;
+ aw->worker.retries = JK_RETRIES;
aw->logon = NULL; /* No Logon on AJP13 */
1.23 +4 -1
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_ajp14_worker.c 11 Nov 2004 17:52:04 -0000 1.22
+++ jk_ajp14_worker.c 19 Nov 2004 12:58:18 -0000 1.23
@@ -306,6 +306,8 @@
return JK_FALSE;
}
aw = pThis->worker_private;
+ pThis->retries = jk_get_worker_retries(props, aw->name,
+ JK_RETRIES);
/* Set Secret Key (used at logon time) */
aw->login->secret_key = strdup(jk_get_worker_secret_key(props,
aw->name));
@@ -431,6 +433,7 @@
aw->worker.init = init;
aw->worker.get_endpoint = get_endpoint;
aw->worker.destroy = destroy;
+ aw->worker.retries = JK_RETRIES;
aw->logon = logon; /* LogOn Handler for AJP14 */
*w = &aw->worker;
1.28 +2 -1
jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_jni_worker.c 11 Nov 2004 19:00:56 -0000 1.27
+++ jk_jni_worker.c 19 Nov 2004 12:58:18 -0000 1.28
@@ -700,6 +700,7 @@
private_data->worker.init = init;
private_data->worker.get_endpoint = get_endpoint;
private_data->worker.destroy = destroy;
+ private_data->worker.retries = JK_RETRIES;
*w = &private_data->worker;
the_singleton_jni_worker = &private_data->worker;
1.30 +6 -2 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_lb_worker.c 11 Nov 2004 18:43:07 -0000 1.29
+++ jk_lb_worker.c 19 Nov 2004 12:58:18 -0000 1.30
@@ -495,7 +495,10 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *log)
{
- /* Nothing to do for now */
+
+ lb_worker_t *p = (lb_worker_t *)pThis->worker_private;
+ pThis->retries = jk_get_worker_retries(props, p->name,
+ JK_RETRIES);
return JK_TRUE;
}
@@ -567,6 +570,7 @@
private_data->worker.init = init;
private_data->worker.get_endpoint = get_endpoint;
private_data->worker.destroy = destroy;
+ private_data->worker.retries = JK_RETRIES;
*w = &private_data->worker;
JK_TRACE_EXIT(l);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
