You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/11/28 10:56:10 UTC
svn commit: r479969 - /tomcat/connectors/trunk/jk/native/common/jk_status.c
Author: rjung
Date: Tue Nov 28 01:56:10 2006
New Revision: 479969
URL: http://svn.apache.org/viewvc?view=rev&rev=479969
Log:
Add easier to detect result message to the end of status worker output.
Should help with automation.
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=479969&r1=479968&r2=479969
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Tue Nov 28 01:56:10 2006
@@ -2609,14 +2609,30 @@
}
if (err) {
if (mime == JK_STATUS_MIME_HTML) {
- jk_putv(s, "<p><b>", err, "</b></p>", NULL);
+ jk_putv(s, "<p><b>Result: ERROR - ", err, "</b></p>", NULL);
jk_putv(s, "<a href=\"", s->req_uri, "\">JK Status Manager</a>", NULL);
}
else if (mime == JK_STATUS_MIME_XML) {
- jk_putv(s, "<Error>", err, "</Error>", NULL);
+ jk_putv(s, " <", w->ns, "result\n", NULL);
+ jk_puts(s, " type=\"ERROR\"\n");
+ jk_putv(s, " msg=\"", err, "\"/>\n", NULL);
}
else {
- jk_puts(s, err);
+ jk_putv(s, "ERROR - ", err, NULL);
+ }
+ }
+ else {
+ if (mime == JK_STATUS_MIME_HTML) {
+ jk_puts(s, "<p><b>Result: OK - Action finished</b></p>");
+ jk_putv(s, "<a href=\"", s->req_uri, "\">JK Status Manager</a>", NULL);
+ }
+ else if (mime == JK_STATUS_MIME_XML) {
+ jk_putv(s, " <", w->ns, "result\n", NULL);
+ jk_puts(s, " type=\"OK\"\n");
+ jk_puts(s, " msg=\"Action finished\"/>\n");
+ }
+ else {
+ jk_puts(s, "OK - Action finished");
}
}
if (mime == JK_STATUS_MIME_HTML) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org