Author: rjung
Date: Sat Mar 21 22:09:09 2009
New Revision: 757033
URL: http://svn.apache.org/viewvc?rev=757033&view=rev
Log:
Add use_server_errors to status worker map display.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
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?rev=757033&r1=757032&r2=757033&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Mar 21 22:09:09
2009
@@ -231,10 +231,10 @@
#define JK_STATUS_FORM_START "<form method=\"%s\"
action=\"%s\">\n"
#define JK_STATUS_FORM_HIDDEN_INT "<input type=\"hidden\" name=\"%s\"
value=\"%d\"/>\n"
#define JK_STATUS_FORM_HIDDEN_STRING "<input type=\"hidden\" name=\"%s\"
value=\"%s\"/>\n"
-#define JK_STATUS_URI_MAP_TABLE_HEAD
"<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n"
-#define JK_STATUS_URI_MAP_TABLE_ROW
"<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n"
-#define JK_STATUS_URI_MAP_TABLE_HEAD2
"<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n"
-#define JK_STATUS_URI_MAP_TABLE_ROW2
"<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n"
+#define JK_STATUS_URI_MAP_TABLE_HEAD
"<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n"
+#define JK_STATUS_URI_MAP_TABLE_ROW
"<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%d</td></tr>\n"
+#define JK_STATUS_URI_MAP_TABLE_HEAD2
"<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n"
+#define JK_STATUS_URI_MAP_TABLE_ROW2
"<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%d</td></tr>\n"
#define JK_STATUS_SHOW_AJP_CONF_HEAD "<tr>" \
"<th>Type</th>" \
"<th>"
JK_STATUS_ARG_AJP_TEXT_HOST_STR "</th>" \
@@ -1534,7 +1534,8 @@
uwr->extensions.fail_on_status_str ?
uwr->extensions.fail_on_status_str : "-",
uwr->extensions.active ? uwr->extensions.active :
"-",
uwr->extensions.disabled ? uwr->extensions.disabled
: "-",
- uwr->extensions.stopped ? uwr->extensions.stopped :
"-");
+ uwr->extensions.stopped ? uwr->extensions.stopped :
"-",
+ uwr->extensions.use_server_error_pages);
else
jk_printf(s, JK_STATUS_URI_MAP_TABLE_ROW,
uwr->uri,
@@ -1544,7 +1545,8 @@
uwr->extensions.fail_on_status_str ?
uwr->extensions.fail_on_status_str : "-",
uwr->extensions.active ? uwr->extensions.active :
"-",
uwr->extensions.disabled ? uwr->extensions.disabled
: "-",
- uwr->extensions.stopped ? uwr->extensions.stopped :
"-");
+ uwr->extensions.stopped ? uwr->extensions.stopped :
"-",
+ uwr->extensions.use_server_error_pages);
}
else if (mime == JK_STATUS_MIME_XML) {
jk_print_xml_start_elt(s, w, 6, 0, "map");
@@ -1559,6 +1561,7 @@
jk_print_xml_att_string(s, 8, "active", uwr->extensions.active);
jk_print_xml_att_string(s, 8, "disabled",
uwr->extensions.disabled);
jk_print_xml_att_string(s, 8, "stopped", uwr->extensions.stopped);
+ jk_print_xml_att_int(s, 8, "use_server_errors",
uwr->extensions.use_server_error_pages);
jk_print_xml_stop_elt(s, 6, 1);
}
else if (mime == JK_STATUS_MIME_TXT) {
@@ -1574,6 +1577,7 @@
jk_printf(s, " active=\"%s\"", uwr->extensions.active ?
uwr->extensions.active : "-");
jk_printf(s, " disabled=\"%s\"", uwr->extensions.disabled ?
uwr->extensions.disabled : "-");
jk_printf(s, " stopped=\"%s\"", uwr->extensions.stopped ?
uwr->extensions.stopped : "-");
+ jk_printf(s, " use_server_errors=\"%d\"",
uwr->extensions.use_server_error_pages);
jk_puts(s, "\n");
}
else if (mime == JK_STATUS_MIME_PROP) {
@@ -1587,6 +1591,7 @@
jk_print_prop_item_string(s, w, worker, "map", count, "active",
uwr->extensions.active);
jk_print_prop_item_string(s, w, worker, "map", count, "disabled",
uwr->extensions.disabled);
jk_print_prop_item_string(s, w, worker, "map", count, "stopped",
uwr->extensions.stopped);
+ jk_print_prop_item_int(s, w, worker, "map", count,
"use_server_errors", uwr->extensions.use_server_error_pages);
}
}
JK_TRACE_EXIT(l);
@@ -1636,10 +1641,10 @@
jk_puts(s, "]</h3><table>\n");
if (has_server_iterator)
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD2,
- "Server", "URI", "Match Type", "Source", "Reply
Timeout", "Fail on Status", "Active", "Disabled", "Stopped");
+ "Server", "URI", "Match Type", "Source", "Reply
Timeout", "Fail on Status", "Active", "Disabled", "Stopped", "Use Server
Errors");
else
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD,
- "URI", "Match Type", "Source", "Reply Timeout",
"Fail on Status", "Active", "Disabled", "Stopped");
+ "URI", "Match Type", "Source", "Reply Timeout",
"Fail on Status", "Active", "Disabled", "Stopped", "Use Server Errors");
}
count = 0;
if (has_server_iterator) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=757033&r1=757032&r2=757033&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Mar 21
22:09:09 2009
@@ -148,6 +148,9 @@
<fix>
Status: Wildcards in sub worker names were broken for update actions.
(rjung)
</fix>
+ <fix>
+ Status: Add use_server_errors to map display. (rjung)
+ </fix>
<update>
SHM: Move locking into the data pull and push methods. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
