mturk 2005/02/16 04:07:28
Modified: jk/native/common jk_util.c
Log:
Allow worker.lb.method to accept string methods t[raffic] or
r[equest]. Only the first letter is checked.
Revision Changes Path
1.59 +11 -2 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- jk_util.c 16 Feb 2005 11:43:39 -0000 1.58
+++ jk_util.c 16 Feb 2005 12:07:28 -0000 1.59
@@ -704,12 +704,21 @@
int jk_get_lb_method(jk_map_t *m, const char *wname)
{
char buf[1024];
+ const char *v;
if (!m || !wname) {
return DEFAULT_LB_FACTOR;
}
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, METHOD_OF_WORKER);
- return jk_map_get_int(m, buf, JK_LB_BYREQUESTS);
+ v = jk_map_get_string(m, buf, NULL);
+ if (!v)
+ return JK_LB_BYREQUESTS;
+ else if (*v == 't' || *v == 'T' || *v == '1')
+ return JK_LB_BYTRAFFIC;
+ else if (*v == 'r' || *v == 'R' || *v == '0')
+ return JK_LB_BYREQUESTS;
+ else
+ return JK_LB_BYREQUESTS;
}
int jk_get_lb_worker_list(jk_map_t *m,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
