Author: rjung
Date: Mon Apr 29 10:59:33 2013
New Revision: 1476960
URL: http://svn.apache.org/r1476960
Log:
Wire Diagnostics to manager webapp text interface.
Not yet documented.
Wiring for html interface still missing.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1476960&r1=1476959&r2=1476960&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Apr
29 10:59:33 2013
@@ -57,6 +57,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.util.ContextName;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
+import org.apache.tomcat.util.Diagnostics;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -366,6 +367,10 @@ public class ManagerServlet extends Http
undeploy(writer, cn, smClient);
} else if (command.equals("/findleaks")) {
findleaks(statusLine, writer, smClient);
+ } else if (command.equals("/vminfo")) {
+ vmInfo(writer, smClient);
+ } else if (command.equals("/threaddump")) {
+ threadDump(writer, smClient);
} else if (command.equals("/sslConnectorCiphers")) {
sslConnectorCiphers(writer);
} else {
@@ -532,6 +537,26 @@ public class ManagerServlet extends Http
}
+ /**
+ *
+ * Write some VM info
+ *
+ * @param writer
+ */
+ protected void vmInfo(PrintWriter writer, StringManager smClient) {
+ writer.print(Diagnostics.getVMInfo());
+ }
+
+ /**
+ *
+ * Write a JVM thread dump
+ *
+ * @param writer
+ */
+ protected void threadDump(PrintWriter writer, StringManager smClient) {
+ writer.print(Diagnostics.getThreadDump());
+ }
+
protected void sslConnectorCiphers(PrintWriter writer) {
writer.println("OK - Connector / SSL Cipher information");
Map<String,Set<String>> connectorCiphers = getConnectorCiphers();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
