You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2023/01/02 04:42:17 UTC
[incubator-eventmesh] branch master updated: fix issue2704
This is an automated email from the ASF dual-hosted git repository.
mikexue 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 af6ea771e fix issue2704
new 91c9ab883 Merge pull request #2769 from jonyangx/issue2704
af6ea771e is described below
commit af6ea771e3e777f426e0fe5d98596a984e7f8526
Author: jonyangx <jo...@gmail.com>
AuthorDate: Sat Dec 31 23:25:01 2022 +0800
fix issue2704
---
.../admin/handler/RejectAllClientHandler.java | 48 +++++++++-------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
index 737666354..e9ebc0cb7 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
@@ -42,11 +42,12 @@ import com.sun.net.httpserver.HttpExchange;
@EventHttpHandler(path = "/clientManage/rejectAllClient")
public class RejectAllClientHandler extends AbstractHttpHandler {
- private static final Logger logger = LoggerFactory.getLogger(RejectAllClientHandler.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RejectAllClientHandler.class);
- private final EventMeshTCPServer eventMeshTCPServer;
+ private final transient EventMeshTCPServer eventMeshTCPServer;
- public RejectAllClientHandler(EventMeshTCPServer eventMeshTCPServer, HttpHandlerManager httpHandlerManager) {
+ public RejectAllClientHandler(final EventMeshTCPServer eventMeshTCPServer,
+ final HttpHandlerManager httpHandlerManager) {
super(httpHandlerManager);
this.eventMeshTCPServer = eventMeshTCPServer;
}
@@ -58,18 +59,18 @@ public class RejectAllClientHandler extends AbstractHttpHandler {
* @throws IOException
*/
@Override
- public void handle(HttpExchange httpExchange) throws IOException {
- String result = "";
- OutputStream out = httpExchange.getResponseBody();
- try {
- ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
- ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
+ public void handle(final HttpExchange httpExchange) throws IOException {
+ try (OutputStream out = httpExchange.getResponseBody()) {
+ final ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
+ final ConcurrentHashMap<InetSocketAddress, Session> sessionMap = clientSessionGroupMapping.getSessionMap();
final List<InetSocketAddress> successRemoteAddrs = new ArrayList<>();
try {
- logger.info("rejectAllClient in admin====================");
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("rejectAllClient in admin====================");
+ }
if (!sessionMap.isEmpty()) {
- for (Map.Entry<InetSocketAddress, Session> entry : sessionMap.entrySet()) {
- InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(
+ for (final Map.Entry<InetSocketAddress, Session> entry : sessionMap.entrySet()) {
+ final InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(
eventMeshTCPServer, entry.getValue(), clientSessionGroupMapping);
if (addr != null) {
successRemoteAddrs.add(addr);
@@ -77,27 +78,18 @@ public class RejectAllClientHandler extends AbstractHttpHandler {
}
}
} catch (Exception e) {
- logger.error("clientManage|rejectAllClient|fail", e);
- result = String.format("rejectAllClient fail! sessionMap size {%d}, had reject {%s}, errorMsg : %s",
- sessionMap.size(), NetUtils.addressToString(successRemoteAddrs), e.getMessage());
+ LOGGER.error("clientManage rejectAllClient fail", e);
NetUtils.sendSuccessResponseHeaders(httpExchange);
- out.write(result.getBytes(Constants.DEFAULT_CHARSET));
+ out.write(String.format("rejectAllClient fail! sessionMap size {%d}, had reject {%s}, errorMsg : %s",
+ sessionMap.size(), NetUtils.addressToString(successRemoteAddrs), e.getMessage())
+ .getBytes(Constants.DEFAULT_CHARSET));
return;
}
- result = String.format("rejectAllClient success! sessionMap size {%d}, had reject {%s}", sessionMap.size(),
- NetUtils.addressToString(successRemoteAddrs));
NetUtils.sendSuccessResponseHeaders(httpExchange);
- out.write(result.getBytes(Constants.DEFAULT_CHARSET));
+ out.write(String.format("rejectAllClient success! sessionMap size {%d}, had reject {%s}", sessionMap.size(),
+ NetUtils.addressToString(successRemoteAddrs)).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
- logger.error("rejectAllClient fail...", e);
- } finally {
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- logger.warn("out close failed...", e);
- }
- }
+ LOGGER.error("rejectAllClient fail.", e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org