remm 2003/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 Changes Path
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 -0000 1.11
+++ StatusManagerServlet.java 16 Sep 2003 15:36:07 -0000 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
+ StatusTransformer.writeFooter(writer, mode);
+
}
// ------------------------------------------- NotificationListener Methods
1.4 +9 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatusTransformer.java 7 Sep 2003 18:47:14 -0000 1.3
+++ StatusTransformer.java 16 Sep 2003 15:36:07 -0000 1.4
@@ -725,11 +725,12 @@
}
if (mb) {
- long mbytes = bytes / 1000000;
- long rest = (bytes / 10000) - mbytes * 100;
- return (mbytes + "." + rest + " MB");
+ long mbytes = bytes / (1024 * 1024);
+ long rest =
+ ((bytes - (mbytes * (1024 * 1024))) * 100) / (1024 * 1024);
+ return (mbytes + "." + ((rest < 10) ? "0" : "") + rest + " MB");
} else {
- return ((bytes / 1000) + " KB");
+ return ((bytes / 1024) + " KB");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
