cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java StatusTransformer.java
remm2005/04/18 15:50:24
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java StatusTransformer.java
Log:
- Add some OS level stats if APR is available. Swallow silently if APR is not
available.
Revision ChangesPath
1.16 +4 -1
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StatusManagerServlet.java 23 Sep 2004 07:03:27 - 1.15
+++ StatusManagerServlet.java 18 Apr 2005 22:50:24 - 1.16
@@ -276,6 +276,9 @@
try {
+// Display operating system statistics using APR if available
+StatusTransformer.writeOSState(writer,mode);
+
// Display virtual machine statistics
StatusTransformer.writeVMState(writer,mode);
1.26 +52 -2
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Index: StatusTransformer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StatusTransformer.java14 Apr 2005 23:32:54 - 1.25
+++ StatusTransformer.java18 Apr 2005 22:50:24 - 1.26
@@ -18,6 +18,7 @@
package org.apache.catalina.manager;
import java.io.PrintWriter;
+import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.Date;
import java.util.Enumeration;
@@ -142,6 +143,55 @@
/**
+ * Write the OS state. Mode 0 will generate HTML.
+ * Mode 1 will generate XML.
+ */
+public static void writeOSState(PrintWriter writer, int mode) {
+long[] result = new long[14];
+boolean ok = false;
+try {
+String methodName = info;
+Class paramTypes[] = new Class[1];
+paramTypes[0] = result.getClass();
+Object paramValues[] = new Object[1];
+paramValues[0] = result;
+Method method = Class.forName(org.apache.tomcat.jni.OS)
+.getMethod(methodName, paramTypes);
+method.invoke(null, paramValues);
+ok = true;
+} catch (Throwable t) {
+// Ignore
+}
+
+if (ok) {
+if (mode == 0){
+writer.print(h1OS/h1);
+
+writer.print(p);
+writer.print( Physical memory: );
+writer.print(formatSize(new Long(result[0]), true));
+writer.print( Available memory: );
+writer.print(formatSize(new Long(result[1]), true));
+writer.print( Total page file: );
+writer.print(formatSize(new Long(result[2]), true));
+writer.print( Free page file: );
+writer.print(formatSize(new Long(result[3]), true));
+writer.print( Memory load: );
+writer.print(new Long(result[4]));
+writer.print(br);
+writer.print( Process kernel time: );
+writer.print(formatTime(new Long(result[9] / 1000), true));
+writer.print( Process user time: );
+writer.print(formatTime(new Long(result[10] / 1000), true));
+writer.print(/p);
+} else if (mode == 1){
+}
+}
+
+}
+
+
+/**
* Write the VM state. Mode 0 will generate HTML.
* Mode 1 will generate XML.
*/
@@ -853,7 +903,7 @@
}
if (seconds) {
-return ((time / 1000) + s);
+return float) time ) / 1000) + s);
} else {
return (time + ms);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java StatusTransformer.java
remm2004/07/23 15:46:08
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java StatusTransformer.java
Log:
- enum - enumeration (JDK 1.5 update).
Revision ChangesPath
1.14 +4 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StatusManagerServlet.java 27 Feb 2004 14:59:07 - 1.13
+++ StatusManagerServlet.java 23 Jul 2004 22:46:08 - 1.14
@@ -279,9 +279,9 @@
// Display virtual machine statistics
StatusTransformer.writeVMState(writer,mode);
-Enumeration enum = threadPools.elements();
-while (enum.hasMoreElements()) {
-ObjectName objectName = (ObjectName) enum.nextElement();
+Enumeration enumeration = threadPools.elements();
+while (enumeration.hasMoreElements()) {
+ObjectName objectName = (ObjectName) enumeration.nextElement();
String name = objectName.getKeyProperty(name);
// use StatusTransformer to output status
StatusTransformer.writeConnectorState
1.19 +13 -13
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Index: StatusTransformer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StatusTransformer.java26 May 2004 16:41:54 - 1.18
+++ StatusTransformer.java23 Jul 2004 22:46:08 - 1.19
@@ -207,9 +207,9 @@
ObjectName grpName = null;
-Enumeration enum = globalRequestProcessors.elements();
-while (enum.hasMoreElements()) {
-ObjectName objectName = (ObjectName) enum.nextElement();
+Enumeration enumeration = globalRequestProcessors.elements();
+while (enumeration.hasMoreElements()) {
+ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty(name))) {
grpName = objectName;
}
@@ -239,9 +239,9 @@
writer.print(table border=\0\trthStage/ththTime/ththB
Sent/ththB Recv/ththClient/ththVHost/ththRequest/th/tr);
-enum = requestProcessors.elements();
-while (enum.hasMoreElements()) {
-ObjectName objectName = (ObjectName) enum.nextElement();
+enumeration = requestProcessors.elements();
+while (enumeration.hasMoreElements()) {
+ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty(worker))) {
writer.print(tr);
writeProcessorState(writer, objectName, mBeanServer, mode);
@@ -267,9 +267,9 @@
ObjectName grpName = null;
-Enumeration enum = globalRequestProcessors.elements();
-while (enum.hasMoreElements()) {
-ObjectName objectName = (ObjectName) enum.nextElement();
+Enumeration enumeration = globalRequestProcessors.elements();
+while (enumeration.hasMoreElements()) {
+ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty(name))) {
grpName = objectName;
}
@@ -287,9 +287,9 @@
writer.write( /);
writer.write(workers);
-enum = requestProcessors.elements();
-while (enum.hasMoreElements()) {
-ObjectName objectName = (ObjectName) enum.nextElement();
+enumeration = requestProcessors.elements();
+while (enumeration.hasMoreElements()) {
+ObjectName objectName = (ObjectName) enumeration.nextElement();
if (name.equals(objectName.getKeyProperty(worker))) {
writeProcessorState(writer, objectName, mBeanServer, mode);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java StatusTransformer.java
remm2003/09/16 08:36:07
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java StatusTransformer.java
Log:
- Tab cleanup.
- We're not in the HD buisness, so a KB is 1024 bytes, and a MB is 1024 KB :)
- Fix formatting errors for MB sizes.
Revision ChangesPath
1.12 +24 -22
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StatusManagerServlet.java 4 Sep 2003 14:22:18 - 1.11
+++ StatusManagerServlet.java 16 Sep 2003 15:36:07 - 1.12
@@ -259,7 +259,7 @@
(request.getPathInfo().equals(/all))) {
completeStatus = true;
}
- // use StatusTransformer to output status
+// use StatusTransformer to output status
StatusTransformer.writeHeader(writer,mode);
// Body Header Section
@@ -270,7 +270,7 @@
} else {
args[1] = sm.getString(statusServlet.title);
}
- // use StatusTransformer to output status
+// use StatusTransformer to output status
StatusTransformer.writeBody(writer,args,mode);
// Manager Section
@@ -295,11 +295,11 @@
(request.getContextPath() + /status/all);
args[8] = sm.getString(statusServlet.complete);
}
- // use StatusTransformer to output status
+// use StatusTransformer to output status
StatusTransformer.writeManager(writer,args,mode);
// Server Header Section
- args = new Object[7];
+args = new Object[7];
args[0] = sm.getString(htmlManagerServlet.serverTitle);
args[1] = sm.getString(htmlManagerServlet.serverVersion);
args[2] = sm.getString(htmlManagerServlet.serverJVMVersion);
@@ -307,7 +307,7 @@
args[4] = sm.getString(htmlManagerServlet.serverOSName);
args[5] = sm.getString(htmlManagerServlet.serverOSVersion);
args[6] = sm.getString(htmlManagerServlet.serverOSArch);
- // use StatusTransformer to output status
+// use StatusTransformer to output status
StatusTransformer.writePageHeading(writer,args,mode);
// Server Row Section
@@ -318,38 +318,40 @@
args[3] = System.getProperty(os.name);
args[4] = System.getProperty(os.version);
args[5] = System.getProperty(os.arch);
- // use StatusTransformer to output status
-StatusTransformer.writeServerInfo(writer,args,mode);
+// use StatusTransformer to output status
+StatusTransformer.writeServerInfo(writer, args, mode);
try {
// Display virtual machine statistics
-// writeVMState(writer);
StatusTransformer.writeVMState(writer,mode);
Enumeration enum = threadPools.elements();
while (enum.hasMoreElements()) {
ObjectName objectName = (ObjectName) enum.nextElement();
String name = objectName.getKeyProperty(name);
- // use StatusTransformer to output status
-StatusTransformer.writeConnectorState(writer,objectName,
- name,mBeanServer,globalRequestProcessors,
- requestProcessors,mode);
+// use StatusTransformer to output status
+StatusTransformer.writeConnectorState
+(writer, objectName,
+ name, mBeanServer, globalRequestProcessors,
+ requestProcessors, mode);
}
if ((request.getPathInfo() != null)
(request.getPathInfo().equals(/all))) {
-// Warning: slow
- // use StatusTransformer to output status
-StatusTransformer.writeDetailedState(writer,mBeanServer,mode);
+// Note: Retrieving the full status is much slower
+// use StatusTransformer to output status
+StatusTransformer.writeDetailedState
+(writer, mBeanServer, mode);
}
} catch (Exception e) {
-e.printStackTrace();
+throw new ServletException(e);
}
- // use StatusTransformer to output status
- StatusTransformer.writeFooter(writer,mode);
+// use StatusTransformer to output status
+
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/08/17 07:50:25
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java
Log:
- Display byte sizes and times using sensible units (KB and MB, s and ms).
- Display the remote host when in keepalive status, as well as the elapsed time
(it corresponds mostly to the amount of time since the start of the previous
request).
Revision ChangesPath
1.10 +125 -40
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StatusManagerServlet.java 4 Aug 2003 15:33:08 - 1.9
+++ StatusManagerServlet.java 17 Aug 2003 14:50:24 - 1.10
@@ -355,11 +355,15 @@
writer.print(p);
writer.print( Free memory: );
-writer.print(Runtime.getRuntime().freeMemory());
+writer.print(formatSize(new Long(Runtime.getRuntime().freeMemory()),
+true));
writer.print( Total memory: );
-writer.print(Runtime.getRuntime().totalMemory());
+writer.print(formatSize(new Long(Runtime.getRuntime().totalMemory()),
+true));
writer.print( Max memory: );
-writer.print(JdkCompat.getJdkCompat().getMaxMemory());
+writer.print(formatSize
+ (new Long(JdkCompat.getJdkCompat().getMaxMemory()),
+ true));
writer.print(/p);
}
@@ -405,17 +409,21 @@
}
writer.print( Max processing time: );
-writer.print(mBeanServer.getAttribute(grpName, maxTime));
-writer.print( Processing time:);
-writer.print(mBeanServer.getAttribute(grpName, processingTime));
+writer.print(formatTime(mBeanServer.getAttribute
+(grpName, maxTime), false));
+writer.print( Processing time: );
+writer.print(formatTime(mBeanServer.getAttribute
+(grpName, processingTime), true));
writer.print( Request count: );
writer.print(mBeanServer.getAttribute(grpName, requestCount));
writer.print( Error count: );
writer.print(mBeanServer.getAttribute(grpName, errorCount));
writer.print( Bytes received: );
-writer.print(mBeanServer.getAttribute(grpName, bytesReceived));
+writer.print(formatSize(mBeanServer.getAttribute
+(grpName, bytesReceived), true));
writer.print( Bytes sent: );
-writer.print(mBeanServer.getAttribute(grpName, bytesSent));
+writer.print(formatSize(mBeanServer.getAttribute
+(grpName, bytesSent), true));
writer.print(/p);
writer.print(table border=\0\trthStage/ththTime/ththB
Sent/ththB Recv/ththClient/ththVHost/ththRequest/th/tr);
@@ -449,6 +457,7 @@
(Integer) mBeanServer.getAttribute(pName, stage);
int stage = stageValue.intValue();
boolean fullStatus = true;
+boolean showRequest = true;
writer.write(tdstrong);
@@ -477,7 +486,8 @@
break;
case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
writer.write(K);
-fullStatus = false;
+fullStatus = true;
+showRequest = false;
break;
case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
writer.write(R);
@@ -493,34 +503,52 @@
if (fullStatus) {
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestProcessingTime));
+writer.print(formatTime(mBeanServer.getAttribute
+(pName, requestProcessingTime), false));
writer.write(/td);
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestBytesSent));
+if (showRequest) {
+writer.print(formatSize(mBeanServer.getAttribute
+(pName, requestBytesSent), false));
+} else {
+writer.write(?);
+}
writer.write(/td);
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestBytesReceived));
+if (showRequest) {
+writer.print(formatSize(mBeanServer.getAttribute
+
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/08/04 08:33:08
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java
Log:
- Also display wrapper mappings.
Revision ChangesPath
1.9 +17 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StatusManagerServlet.java 30 Jul 2003 18:43:01 - 1.8
+++ StatusManagerServlet.java 4 Aug 2003 15:33:08 - 1.9
@@ -607,8 +607,21 @@
String servletName = objectName.getKeyProperty(name);
+String[] mappings = (String[])
+mBeanServer.invoke(objectName, findMappings, null, null);
+
writer.print(h2);
writer.print(servletName);
+if ((mappings != null) (mappings.length 0)) {
+writer.print( [ );
+for (int i = 0; i mappings.length; i++) {
+writer.print(mappings[i]);
+if (i mappings.length - 1) {
+writer.print( , );
+}
+}
+writer.print( ] );
+}
writer.print(/h2);
writer.print(p);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/07/28 07:11:09
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java
Log:
- Display contexts and servlets stats.
Revision ChangesPath
1.4 +95 -9
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatusManagerServlet.java 22 Jun 2003 17:32:44 - 1.3
+++ StatusManagerServlet.java 28 Jul 2003 14:11:08 - 1.4
@@ -255,7 +255,7 @@
if ((request.getPathInfo() != null)
(request.getPathInfo().equals(/all))) {
// Warning: slow
-writeApplicationsState(writer);
+writeDetailedState(writer);
}
} catch (Exception e) {
@@ -452,16 +452,102 @@
/**
* Write applications state.
*/
-protected void writeApplicationsState(PrintWriter writer)
+protected void writeDetailedState(PrintWriter writer)
throws Exception {
-ObjectName queryHosts = new ObjectName(*:type=Host,*);
+ObjectName queryHosts = new ObjectName(*:j2eeType=WebModule,*);
Set hostsON = mBeanServer.queryNames(queryHosts, null);
Iterator iterator = hostsON.iterator();
while (iterator.hasNext()) {
-ObjectName hostON = (ObjectName) iterator.next();
-System.out.println(Host: + hostON);
+ObjectName contextON = (ObjectName) iterator.next();
+writeContext(writer, contextON);
}
+
+}
+
+
+/**
+ * Write context state.
+ */
+protected void writeContext(PrintWriter writer, ObjectName objectName)
+throws Exception {
+
+String webModuleName = objectName.getKeyProperty(name);
+String name = webModuleName;
+if (name == null) {
+return;
+}
+
+String hostName = null;
+String contextName = null;
+if (name.startsWith(//)) {
+name = name.substring(2);
+}
+int slash = name.indexOf(/);
+if (slash != -1) {
+hostName = name.substring(0, slash);
+contextName = name.substring(slash);
+} else {
+return;
+}
+// Special case for the root context
+if (contextName.equals(/)) {
+contextName = ;
+}
+
+writer.print(h1);
+writer.print(name);
+writer.print(/h1);
+
+writer.print(br/);
+
+writer.print( Startup time: );
+writer.print(mBeanServer.getAttribute(objectName, startupTime));
+writer.print( TLD scan time: );
+writer.print(mBeanServer.getAttribute(objectName, tldScanTime));
+
+writer.print(br/);
+
+String onStr = *:j2eeType=Servlet,WebModule= + webModuleName + ,*;
+ObjectName servletObjectName = new ObjectName(onStr);
+Set set = mBeanServer.queryMBeans(servletObjectName, null);
+Iterator iterator = set.iterator();
+while (iterator.hasNext()) {
+ObjectInstance oi = (ObjectInstance) iterator.next();
+writeWrapper(writer, oi.getObjectName());
+}
+
+}
+
+
+/**
+ * Write detailed information about a wrapper.
+ */
+public void writeWrapper(PrintWriter writer, ObjectName objectName)
+throws Exception {
+
+String servletName = objectName.getKeyProperty(name);
+
+writer.print(h2);
+writer.print(servletName);
+writer.print(/h2);
+
+writer.print(br/);
+
+writer.print( Processing time: );
+writer.print(mBeanServer.getAttribute(objectName, processingTime));
+writer.print( Max time: );
+writer.print(mBeanServer.getAttribute(objectName, maxTime));
+writer.print( Request count: );
+writer.print(mBeanServer.getAttribute(objectName, requestCount));
+writer.print( Error count: );
+writer.print(mBeanServer.getAttribute(objectName, errorCount));
+writer.print( Load time: );
+writer.print(mBeanServer.getAttribute(objectName, loadTime));
+writer.print( Classload time: );
+writer.print(mBeanServer.getAttribute(objectName, classLoadTime));
+
+writer.print(br/);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail:
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/07/28 09:23:07 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java Log: - Add missing whitespace between method and URI. Revision ChangesPath 1.6 +5 -5 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java Index: StatusManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- StatusManagerServlet.java 28 Jul 2003 14:57:47 - 1.5 +++ StatusManagerServlet.java 28 Jul 2003 16:23:07 - 1.6 @@ -513,7 +513,7 @@ writer.write(td nowrap); writer.write( + filter(mBeanServer.getAttribute (pName, method).toString())); -writer.write( + filter(mBeanServer.getAttribute +writer.write( + filter(mBeanServer.getAttribute (pName, currentUri).toString())); String queryString = (String) mBeanServer.getAttribute (pName, currentQueryString); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/06/22 10:32:44
Modified:webapps/manager/WEB-INF web.xml
webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java
Log:
- Add placeholder code for a complete status display (including webapps stats).
Revision ChangesPath
1.9 +2 -2 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml
Index: web.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.xml 12 Apr 2003 14:17:19 - 1.8
+++ web.xml 22 Jun 2003 17:32:44 - 1.9
@@ -99,7 +99,7 @@
/servlet-mapping
servlet-mapping
servlet-nameStatus/servlet-name
-url-pattern/status/url-pattern
+url-pattern/status/*/url-pattern
/servlet-mapping
servlet-mapping
servlet-nameJMXProxy/servlet-name
@@ -140,7 +140,7 @@
url-pattern/undeploy/url-pattern
url-pattern/reload/url-pattern
url-pattern/serverinfo/url-pattern
- url-pattern/status/url-pattern
+ url-pattern/status/*/url-pattern
url-pattern/roles/url-pattern
url-pattern/resources/url-pattern
/web-resource-collection
1.3 +31 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatusManagerServlet.java 26 Mar 2003 11:01:53 - 1.2
+++ StatusManagerServlet.java 22 Jun 2003 17:32:44 - 1.3
@@ -252,6 +252,12 @@
writeConnectorState(writer, objectName, name);
}
+if ((request.getPathInfo() != null)
+ (request.getPathInfo().equals(/all))) {
+// Warning: slow
+writeApplicationsState(writer);
+}
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -444,6 +450,23 @@
/**
+ * Write applications state.
+ */
+protected void writeApplicationsState(PrintWriter writer)
+throws Exception {
+
+ObjectName queryHosts = new ObjectName(*:type=Host,*);
+Set hostsON = mBeanServer.queryNames(queryHosts, null);
+Iterator iterator = hostsON.iterator();
+while (iterator.hasNext()) {
+ObjectName hostON = (ObjectName) iterator.next();
+System.out.println(Host: + hostON);
+}
+
+}
+
+
+/**
* Filter the specified message string for characters that are sensitive
* in HTML. This avoids potential attacks caused by including JavaScript
* codes in the request URL that is often reported in error messages.
@@ -517,6 +540,10 @@
} else if (type.equals(RequestProcessor)) {
requestProcessors.removeElement(objectName);
}
+}
+String j2eeType = objectName.getKeyProperty(j2eeType);
+if (j2eeType != null) {
+
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/03/26 03:01:54 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java Log: - Use JDK compat for Runtime.maxMemory(). Revision ChangesPath 1.2 +7 -5 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java Index: StatusManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StatusManagerServlet.java 26 Mar 2003 09:49:19 - 1.1 +++ StatusManagerServlet.java 26 Mar 2003 11:01:53 - 1.2 @@ -87,6 +87,8 @@ import org.apache.commons.modeler.Registry; +import org.apache.tomcat.util.compat.JdkCompat; + /** * This servlet will display a complete status of the HTTP/1.1 connector. * @@ -271,7 +273,7 @@ writer.print( Total memory: ); writer.print(Runtime.getRuntime().totalMemory()); writer.print( Max memory: ); -writer.print(Runtime.getRuntime().maxMemory()); +writer.print(JdkCompat.getJdkCompat().getMaxMemory()); writer.print(br/); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
