Skip to content

Commit

Permalink
Add some indent
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmaucher
rmaucher committed Jan 4, 2024
1 parent 5b6c5cd commit 1465981
Showing 1 changed file with 33 additions and 21 deletions.
54 changes: 33 additions & 21 deletions java/org/apache/catalina/manager/StatusTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,24 +211,25 @@ public static void writeVMState(PrintWriter writer, int mode, Object[] args) thr

writer.write("</jvm>");
} else if (mode == 2) {
writer.append('"').append("jvm").append('"').append(':').append('{').println();
indent(writer, 1).append('"').append("jvm").append('"').append(':').append('{').println();

writer.append('"').append("memory").append('"').append(':').append('{');
indent(writer, 2).append('"').append("memory").append('"').append(':').append('{');
appendJSonValue(writer, "free", Long.toString(Runtime.getRuntime().freeMemory())).append(',');
appendJSonValue(writer, "total", Long.toString(Runtime.getRuntime().totalMemory())).append(',');
appendJSonValue(writer, "max", Long.toString(Runtime.getRuntime().maxMemory()));
writer.append('}').append(',').println();

writer.append('"').append("memorypool").append('"').append(':').append('[');
indent(writer, 2).append('"').append("memorypool").append('"').append(':').append('[');
boolean first = true;
for (MemoryPoolMXBean memoryPoolMBean : memoryPoolMBeans.values()) {
MemoryUsage usage = memoryPoolMBean.getUsage();
if (first) {
first = false;
writer.println();
} else {
writer.append(',').println();
}
writer.append('{');
indent(writer, 3).append('{');
appendJSonValue(writer, "name", JSONFilter.escape(memoryPoolMBean.getName())).append(',');
appendJSonValue(writer, "type", memoryPoolMBean.getType().toString()).append(',');
appendJSonValue(writer, "usageInit", Long.toString(usage.getInit())).append(',');
Expand All @@ -239,7 +240,7 @@ public static void writeVMState(PrintWriter writer, int mode, Object[] args) thr
}
writer.append(']').println();

writer.append('}');
indent(writer, 1).append('}');
}

}
Expand All @@ -250,6 +251,14 @@ private static PrintWriter appendJSonValue(PrintWriter writer, String name, Stri
}


private static PrintWriter indent(PrintWriter writer, int count) {
for (int i = 0; i < count; i++) {
writer.append(' ').append(' ');
}
return writer;
}


/**
* Write connector state.
*
Expand All @@ -269,7 +278,7 @@ public static void writeConnectorsState(PrintWriter writer, MBeanServer mBeanSer
throws Exception {
if (mode == 2) {
writer.append(',').println();
writer.append('"').append("connector").append('"').append(':').append('[').println();
indent(writer, 1).append('"').append("connector").append('"').append(':').append('[').println();
}
boolean first = true;
for (ObjectName objectName : threadPools) {
Expand All @@ -286,7 +295,7 @@ public static void writeConnectorsState(PrintWriter writer, MBeanServer mBeanSer
writer, objectName, name, mBeanServer, globalRequestProcessors, requestProcessors, mode, args);
}
if (mode == 2) {
writer.append(']').println();
writer.append(']');
}
}

Expand Down Expand Up @@ -428,10 +437,11 @@ public static void writeConnectorState(PrintWriter writer, ObjectName tpName, St

writer.write("</connector>");
} else if (mode == 2) {
writer.append('{').println();
indent(writer, 1).append('{').println();

indent(writer, 2);
appendJSonValue(writer, "name", JSONFilter.escape(name)).append(',').println();
writer.append('"').append("threadInfo").append('"').append(':').append('{');
indent(writer, 2).append('"').append("threadInfo").append('"').append(':').append('{');
appendJSonValue(writer, "maxThreads", mBeanServer.getAttribute(tpName, "maxThreads").toString()).append(',');
appendJSonValue(writer, "currentThreadCount", mBeanServer.getAttribute(tpName, "currentThreadCount").toString()).append(',');
appendJSonValue(writer, "currentThreadsBusy", mBeanServer.getAttribute(tpName, "currentThreadsBusy").toString());
Expand All @@ -447,7 +457,7 @@ public static void writeConnectorState(PrintWriter writer, ObjectName tpName, St

if (grpName != null) {
writer.append(',').println();
writer.append('"').append("requestInfo").append('"').append(':').append('{');
indent(writer, 2).append('"').append("requestInfo").append('"').append(':').append('{');
appendJSonValue(writer, "maxTime", mBeanServer.getAttribute(grpName, "maxTime").toString()).append(',');
appendJSonValue(writer, "processingTime", mBeanServer.getAttribute(grpName, "processingTime").toString()).append(',');
appendJSonValue(writer, "requestCount", mBeanServer.getAttribute(grpName, "requestCount").toString()).append(',');
Expand All @@ -458,7 +468,7 @@ public static void writeConnectorState(PrintWriter writer, ObjectName tpName, St
// Note: No detailed per processor info
}

writer.append('}');
indent(writer, 1).append('}');
}
}

Expand Down Expand Up @@ -692,7 +702,7 @@ public static void writeDetailedState(PrintWriter writer, MBeanServer mBeanServe
// for now we don't write out the Detailed state in XML
} else if (mode == 2) {
writer.append(',').println();
writer.append('"').append("context").append('"').append(':').append('[');
indent(writer, 1).append('"').append("context").append('"').append(':').append('[').println();
Iterator<ObjectName> iterator = hostsON.iterator();
boolean first = true;
while (iterator.hasNext()) {
Expand All @@ -704,7 +714,8 @@ public static void writeDetailedState(PrintWriter writer, MBeanServer mBeanServe
ObjectName contextON = iterator.next();
writeContext(writer, contextON, mBeanServer, mode);
}
writer.append(']').println();
writer.println();
indent(writer, 1).append(']').println();
}

}
Expand Down Expand Up @@ -791,8 +802,8 @@ protected static void writeContext(PrintWriter writer, ObjectName objectName, MB
} else if (mode == 1) {
// for now we don't write out the context in XML
} else if (mode == 2) {
writer.append('{');
appendJSonValue(writer, "name", JSONFilter.escape(JSONFilter.escape(name))).append(',');
indent(writer, 2).append('{').println();
appendJSonValue(indent(writer, 3), "name", JSONFilter.escape(JSONFilter.escape(name))).append(',');
appendJSonValue(writer, "startTime",
new Date(((Long) mBeanServer.getAttribute(objectName, "startTime")).longValue()).toString()).append(',');
appendJSonValue(writer, "startupTime", mBeanServer.getAttribute(objectName, "startupTime").toString()).append(',');
Expand All @@ -804,7 +815,7 @@ protected static void writeContext(PrintWriter writer, ObjectName objectName, MB
writeJspMonitor(writer, jspMonitorONs, mBeanServer, mode);
}
writer.append(',').println();
writer.append('"').append("wrapper").append('"').append(':').append('[');
indent(writer, 3).append('"').append("wrapper").append('"').append(':').append('[').println();
String onStr = objectName.getDomain() + ":j2eeType=Servlet,WebModule=" + webModuleName + ",*";
ObjectName servletObjectName = new ObjectName(onStr);
Set<ObjectInstance> set = mBeanServer.queryMBeans(servletObjectName, null);
Expand All @@ -817,8 +828,9 @@ protected static void writeContext(PrintWriter writer, ObjectName objectName, MB
}
writeWrapper(writer, oi.getObjectName(), mBeanServer, mode);
}
writer.append(']').println();
writer.append('}');
writer.println();
indent(writer, 3).append(']').println();
indent(writer, 2).append('}');
}

}
Expand Down Expand Up @@ -859,7 +871,7 @@ public static void writeManager(PrintWriter writer, ObjectName objectName, MBean
// for now we don't write out the wrapper details
} else if (mode == 2) {
writer.append(',').println();
writer.append('"').append("manager").append('"').append(':').append('{');
indent(writer, 3).append('"').append("manager").append('"').append(':').append('{');
appendJSonValue(writer, "activeSessions", mBeanServer.getAttribute(objectName, "activeSessions").toString()).append(',');
appendJSonValue(writer, "sessionCounter", mBeanServer.getAttribute(objectName, "sessionCounter").toString()).append(',');
appendJSonValue(writer, "maxActive", mBeanServer.getAttribute(objectName, "maxActive").toString()).append(',');
Expand Down Expand Up @@ -907,7 +919,7 @@ public static void writeJspMonitor(PrintWriter writer, Set<ObjectName> jspMonito
// for now we don't write out anything
} else if (mode == 2) {
writer.append(',').println();
writer.append('"').append("jsp").append('"').append(':').append('{');
indent(writer, 3).append('"').append("jsp").append('"').append(':').append('{');
appendJSonValue(writer, "jspCount", Integer.toString(jspCount)).append(',');
appendJSonValue(writer, "jspReloadCount", Integer.toString(jspReloadCount));
writer.append('}');
Expand Down Expand Up @@ -964,7 +976,7 @@ public static void writeWrapper(PrintWriter writer, ObjectName objectName, MBean
} else if (mode == 1) {
// for now we don't write out the wrapper details
} else if (mode == 2) {
writer.append('{');
indent(writer, 4).append('{');
appendJSonValue(writer, "servletName", JSONFilter.escape(servletName)).append(',');
appendJSonValue(writer, "processingTime", mBeanServer.getAttribute(objectName, "processingTime").toString()).append(',');
appendJSonValue(writer, "maxTime", mBeanServer.getAttribute(objectName, "maxTime").toString()).append(',');
Expand Down

0 comments on commit 1465981

Please sign in to comment.