This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 060d0f2494 Cleanup connector names in json
060d0f2494 is described below
commit 060d0f2494000b42217a953e4104cdfe2c887106
Author: remm <[email protected]>
AuthorDate: Fri Jan 5 16:17:06 2024 +0100
Cleanup connector names in json
---
.../apache/catalina/manager/StatusTransformer.java | 19 ++++++++++++-------
.../catalina/manager/TestStatusTransformer.java | 3 +--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index 1491b34d82..a7ca171cc1 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -304,7 +304,8 @@ public class StatusTransformer {
appendJSonValue(writer, "usageUsed",
Long.toString(usage.getUsed()));
writer.append('}');
}
- writer.append(']').println();
+ writer.println();
+ indent(writer, 2).append(']').println();
indent(writer, 1).append('}');
}
@@ -503,11 +504,15 @@ public class StatusTransformer {
writer.write("</connector>");
} else if (mode == 2) {
- indent(writer, 1).append('{').println();
+ indent(writer, 2).append('{').println();
- indent(writer, 2);
- appendJSonValue(writer, "name",
JSONFilter.escape(name)).append(',').println();
- indent(writer,
2).append('"').append("threadInfo").append('"').append(':').append('{');
+ indent(writer, 3);
+ String jsonName = JSONFilter.escape(name);
+ if (jsonName.length() > 4 && jsonName.startsWith("\\\"") &&
jsonName.endsWith("\\\"")) {
+ jsonName = jsonName.substring(2, jsonName.length() - 2);
+ }
+ appendJSonValue(writer, "name", jsonName).append(',').println();
+ indent(writer,
3).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());
@@ -523,7 +528,7 @@ public class StatusTransformer {
if (grpName != null) {
writer.append(',').println();
- indent(writer,
2).append('"').append("requestInfo").append('"').append(':').append('{');
+ indent(writer,
3).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(',');
@@ -534,7 +539,7 @@ public class StatusTransformer {
// Note: No detailed per processor info
}
- indent(writer, 1).append('}');
+ indent(writer, 2).append('}');
}
}
diff --git a/test/org/apache/catalina/manager/TestStatusTransformer.java
b/test/org/apache/catalina/manager/TestStatusTransformer.java
index b031004979..3cd772fdd4 100644
--- a/test/org/apache/catalina/manager/TestStatusTransformer.java
+++ b/test/org/apache/catalina/manager/TestStatusTransformer.java
@@ -72,10 +72,9 @@ public class TestStatusTransformer extends TomcatBaseTest {
client.connect();
client.processRequest(true);
String json = client.getResponseBody();
-
+ System.out.println(json);
JSONParser parser = new JSONParser(json);
String result = parser.parse().toString();
- System.out.println(result);
Assert.assertTrue(result.contains("name=localhost/"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
