mturk 2005/05/15 06:02:39 Modified: jk/native/common jk_lb_worker.c jk_worker.c jk_worker.h Log: Add use_map so that load balancer members do not inherit mount directives if specified unless they are in worker.list. Revision Changes Path 1.87 +2 -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.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- jk_lb_worker.c 15 May 2005 12:47:24 -0000 1.86 +++ jk_lb_worker.c 15 May 2005 13:02:38 -0000 1.87 @@ -790,7 +790,7 @@ p->lb_workers[i].s->is_disabled = jk_get_is_worker_disabled(props, worker_names[i]); /* Worker can be initaly deactive as cold standby */ p->lb_workers[i].s->is_stopped = jk_get_is_worker_stopped(props, worker_names[i]); - if (!wc_create_worker(p->lb_workers[i].s->name, + if (!wc_create_worker(p->lb_workers[i].s->name, 0, props, &(p->lb_workers[i].w), we, l) || !p->lb_workers[i].w) { 1.34 +5 -4 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- jk_worker.c 15 May 2005 11:10:11 -0000 1.33 +++ jk_worker.c 15 May 2005 13:02:38 -0000 1.34 @@ -111,7 +111,7 @@ return rc; } -int wc_create_worker(const char *name, +int wc_create_worker(const char *name, int use_map, jk_map_t *init_data, jk_worker_t **rc, jk_worker_env_t *we, jk_logger_t *l) { @@ -165,7 +165,8 @@ JK_TRACE_EXIT(l); return JK_FALSE; } - if (jk_get_worker_mount_list(init_data, name, + if (use_map && + jk_get_worker_mount_list(init_data, name, &map_names, &num_of_maps) && num_of_maps) { for (i = 0; i < num_of_maps; i++) { @@ -232,7 +233,7 @@ jk_log(l, JK_LOG_DEBUG, "creating worker %s", worker_list[i]); - if (wc_create_worker(worker_list[i], init_data, &w, we, l)) { + if (wc_create_worker(worker_list[i], 1, init_data, &w, we, l)) { jk_worker_t *oldw = NULL; if (!jk_map_put(worker_map, worker_list[i], w, (void *)&oldw)) { w->destroy(&w, l); 1.13 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_worker.h Index: jk_worker.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_worker.h 24 Apr 2005 09:54:47 -0000 1.12 +++ jk_worker.h 15 May 2005 13:02:38 -0000 1.13 @@ -39,7 +39,7 @@ jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l); -int wc_create_worker(const char *name, +int wc_create_worker(const char *name, int use_map, jk_map_t *init_data, jk_worker_t **rc, jk_worker_env_t *we, jk_logger_t *l);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]