Author: mturk
Date: Sun Nov 26 12:16:25 2006
New Revision: 479419
URL: http://svn.apache.org/viewvc?view=rev&rev=479419
Log:
Add size param to 'Load Balancers:' and 'Maps:' tags.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=479419&r1=479418&r2=479419
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:16:25
2006
@@ -642,7 +642,16 @@
continue;
}
count++;
- jk_printf(s, "Map:");
+ }
+ if (count) {
+ jk_printf(s, "Maps: size=%d\n", count);
+ }
+ for (i = 0; i < uwmap->size; i++) {
+ uri_worker_record_t *uwr = uwmap->maps[i];
+ if (!worker || strcmp(uwr->worker_name, worker)) {
+ continue;
+ }
+ jk_puts(s, "Map:");
jk_printf(s, " type=%s", uri_worker_map_get_match(uwr, buf, l));
jk_printf(s, " uri=%s", uwr->uri);
jk_printf(s, " source=%s\n", uri_worker_map_get_source(uwr, l));
@@ -1892,9 +1901,21 @@
continue;
}
if (w->type == JK_LB_WORKER_TYPE) {
- if (!has_lb)
- jk_puts(s, "Load Balancers:\n");
- has_lb = 1;
+ has_lb++;
+ }
+ }
+ if (has_lb)
+ jk_printf(s, "Load Balancers: size=%d\n", has_lb);
+
+ for (i = 0; i < sw->we->num_of_workers; i++) {
+ w = wc_get_worker_for_name(sw->we->worker_list[i], l);
+ if (!w) {
+ jk_log(l, JK_LOG_WARNING,
+ "could not find worker '%s'",
+ sw->we->worker_list[i]);
+ continue;
+ }
+ if (w->type == JK_LB_WORKER_TYPE) {
display_worker_txt(s, w, 0, l);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
