This is an automated email from the ASF dual-hosted git repository.
majorhe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 6d018c207 try with resource
new 9d82cff2d Merge pull request #3036 from langzhigang/fix_patch_3005
6d018c207 is described below
commit 6d018c20776b68a722688a0e4a41375091e22743
Author: langzhigang <[email protected]>
AuthorDate: Fri Feb 3 17:41:14 2023 +0800
try with resource
---
.../admin/handler/ConfigurationHandler.java | 78 ++++++++++------------
1 file changed, 35 insertions(+), 43 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
index ee93ca5dd..3324f0f0c 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
@@ -77,53 +77,45 @@ public class ConfigurationHandler extends
AbstractHttpHandler {
* Return a response that contains the EventMesh configuration
*/
void get(HttpExchange httpExchange) throws IOException {
- OutputStream out = httpExchange.getResponseBody();
httpExchange.getResponseHeaders().add("Content-Type",
"application/json");
httpExchange.getResponseHeaders().add("Access-Control-Allow-Origin",
"*");
+ try (OutputStream out = httpExchange.getResponseBody()) {
+ try {
+ GetConfigurationResponse getConfigurationResponse = new
GetConfigurationResponse(
+ eventMeshTCPConfiguration.getSysID(),
+ eventMeshTCPConfiguration.getNamesrvAddr(),
+ eventMeshTCPConfiguration.getEventMeshEnv(),
+ eventMeshTCPConfiguration.getEventMeshIDC(),
+ eventMeshTCPConfiguration.getEventMeshCluster(),
+ eventMeshTCPConfiguration.getEventMeshServerIp(),
+ eventMeshTCPConfiguration.getEventMeshName(),
+ eventMeshTCPConfiguration.getEventMeshWebhookOrigin(),
+
eventMeshTCPConfiguration.isEventMeshServerSecurityEnable(),
+
eventMeshTCPConfiguration.isEventMeshServerRegistryEnable(),
+ // TCP Configuration
+ eventMeshTCPConfiguration.eventMeshTcpServerPort,
+ // HTTP Configuration
+ eventMeshHTTPConfiguration.getHttpServerPort(),
+ eventMeshHTTPConfiguration.isEventMeshServerUseTls(),
+ // gRPC Configuration
+ eventMeshGrpcConfiguration.getGrpcServerPort(),
+ eventMeshGrpcConfiguration.isEventMeshServerUseTls()
+ );
- try {
- GetConfigurationResponse getConfigurationResponse = new
GetConfigurationResponse(
- eventMeshTCPConfiguration.getSysID(),
- eventMeshTCPConfiguration.getNamesrvAddr(),
- eventMeshTCPConfiguration.getEventMeshEnv(),
- eventMeshTCPConfiguration.getEventMeshIDC(),
- eventMeshTCPConfiguration.getEventMeshCluster(),
- eventMeshTCPConfiguration.getEventMeshServerIp(),
- eventMeshTCPConfiguration.getEventMeshName(),
- eventMeshTCPConfiguration.getEventMeshWebhookOrigin(),
- eventMeshTCPConfiguration.isEventMeshServerSecurityEnable(),
- eventMeshTCPConfiguration.isEventMeshServerRegistryEnable(),
- // TCP Configuration
- eventMeshTCPConfiguration.eventMeshTcpServerPort,
- // HTTP Configuration
- eventMeshHTTPConfiguration.getHttpServerPort(),
- eventMeshHTTPConfiguration.isEventMeshServerUseTls(),
- // gRPC Configuration
- eventMeshGrpcConfiguration.getGrpcServerPort(),
- eventMeshGrpcConfiguration.isEventMeshServerUseTls()
- );
-
- String result = JsonUtils.toJson(getConfigurationResponse);
- httpExchange.sendResponseHeaders(200, result.getBytes().length);
- out.write(result.getBytes());
- } catch (Exception e) {
- StringWriter writer = new StringWriter();
- PrintWriter printWriter = new PrintWriter(writer);
- e.printStackTrace(printWriter);
- printWriter.flush();
- String stackTrace = writer.toString();
+ String result = JsonUtils.toJson(getConfigurationResponse);
+ httpExchange.sendResponseHeaders(200,
result.getBytes().length);
+ out.write(result.getBytes());
+ } catch (Exception e) {
+ StringWriter writer = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(writer);
+ e.printStackTrace(printWriter);
+ printWriter.flush();
+ String stackTrace = writer.toString();
- Error error = new Error(e.toString(), stackTrace);
- String result = JsonUtils.toJson(error);
- httpExchange.sendResponseHeaders(500, result.getBytes().length);
- out.write(result.getBytes());
- } finally {
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- logger.warn("out close failed...", e);
- }
+ Error error = new Error(e.toString(), stackTrace);
+ String result = JsonUtils.toJson(error);
+ httpExchange.sendResponseHeaders(500,
result.getBytes().length);
+ out.write(result.getBytes());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
