tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r482090 - /tomcat/connectors/trunk/jk/native/common/jk_status.c
Date Mon, 04 Dec 2006 07:01:27 GMT
Author: mturk
Date: Sun Dec  3 23:01:24 2006
New Revision: 482090

URL: http://svn.apache.org/viewvc?view=rev&rev=482090
Log:
Always display Legend in listing.
Fix tags and display warning when worker mount size is zero.

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=482090&r1=482089&r2=482090
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 23:01:24 2006
@@ -971,6 +971,20 @@
     int count=0;
 
     JK_TRACE_ENTER(l);
+    for (i = 0; i < uwmap->size; i++) {
+        uri_worker_record_t *uwr = uwmap->maps[i];
+        if (!worker || strcmp(uwr->worker_name, worker)) {
+            continue;
+        }
+        count++;
+    }
+    if (!count) {
+        jk_putv(s, "<hr/><h3>Warning: No URI Mappings defined for ",
+                worker, " !</h3>\n", NULL);
+        JK_TRACE_EXIT(l);
+        return;    
+    }
+    count = 0;
     jk_putv(s, "<hr/><h3>URI Mappings for ", worker, "</h3>\n", NULL);
     jk_puts(s, "<table>\n");
     jk_printf(s, JK_STATUS_TABLE_HEAD_3_STRING,
@@ -1029,7 +1043,8 @@
         jk_print_xml_att_string(s, 10, "source", uri_worker_map_get_source(uwr, l));
         jk_print_xml_stop_elt(s, 8, 1);
     }
-    jk_print_xml_close_elt(s, sw, 6, "maps");
+    if (count)
+        jk_print_xml_close_elt(s, sw, 6, "maps");
     if (JK_IS_DEBUG_LEVEL(l))
         jk_log(l, JK_LOG_DEBUG,
                "dumped %d maps for worker '%s'",
@@ -2502,9 +2517,11 @@
         else if (mime == JK_STATUS_MIME_PROP) {
             jk_print_prop_att_int(s, sw, NULL, "lb_cnt", count);
         }
+#if 0
         else {
             jk_printf(s, "<hr/><h2>Listing %d load balancing worker%s</h2>\n",
count, count>1 ? "s" : "");
         }
+#endif
     }
     else {
         if (mime == JK_STATUS_MIME_XML) {
@@ -2551,6 +2568,13 @@
     if (list_lb) {
         if (mime == JK_STATUS_MIME_XML) {
             jk_print_xml_close_elt(s, sw, 0, "balancers");
+        }
+        else if (mime == JK_STATUS_MIME_TXT) {
+        }
+        else if (mime == JK_STATUS_MIME_PROP) {
+        }
+        else {
+            display_legend(s, sw, l);
         }
     }
     else {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message