Skip to content

Commit ff3296a

Browse files
hhuang1231hhuang1231
authored
Merge 88c3114 into 3678c23 
2 parents 3678c23 + 88c3114 commit ff3296a

38 files changed

+1283
-1305
lines changed

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
119119
if (session.getClient().getHost().equals(ip) && String.valueOf(
120120
session.getClient().getPort()).equals(port)) {
121121
redirectResult.append("|");
122-
redirectResult.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer,
122+
redirectResult.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer.getTcpThreadPoolGroup(),
123123
destEventMeshIp, Integer.parseInt(destEventMeshPort),
124124
session, clientSessionGroupMapping));
125125
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
116116
// to the new EventMesh node specified by given EventMesh IP and port.
117117
if (session.getClient().getPath().contains(path)) {
118118
redirectResult.append("|");
119-
redirectResult.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer,
119+
redirectResult.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer.getTcpThreadPoolGroup(),
120120
destEventMeshIp, Integer.parseInt(destEventMeshPort),
121121
session, clientSessionGroupMapping));
122122
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void handle(final HttpExchange httpExchange) throws IOException {
120120
// to the new EventMesh node specified by given EventMesh IP and port.
121121
if (session.getClient().getSubsystem().equals(subSystem)) {
122122
redirectResult.append('|')
123-
.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer,
123+
.append(EventMeshTcp2Client.redirectClient2NewEventMesh(eventMeshTCPServer.getTcpThreadPoolGroup(),
124124
destEventMeshIp, Integer.parseInt(destEventMeshPort),
125125
session, clientSessionGroupMapping));
126126
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void handle(final HttpExchange httpExchange) throws IOException {
9090
// Iterate through the sessionMap and close each client connection
9191
for (final Map.Entry<InetSocketAddress, Session> entry : sessionMap.entrySet()) {
9292
final InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(
93-
eventMeshTCPServer, entry.getValue(), clientSessionGroupMapping);
93+
eventMeshTCPServer.getTcpThreadPoolGroup(), entry.getValue(), clientSessionGroupMapping);
9494
// Add the remote client address to a list of successfully rejected addresses
9595
if (addr != null) {
9696
successRemoteAddrs.add(addr);

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
113113
for (Map.Entry<InetSocketAddress, Session> entry : sessionMap.entrySet()) {
114114
// Reject client connection for each matching session found
115115
if (entry.getKey().getHostString().equals(ip) && String.valueOf(entry.getKey().getPort()).equals(port)) {
116-
InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(eventMeshTCPServer,
116+
InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(eventMeshTCPServer.getTcpThreadPoolGroup(),
117117
entry.getValue(), clientSessionGroupMapping);
118118
// Add the remote client address to a list of successfully rejected addresses
119119
if (addr != null) {

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
121121
for (Session session : sessionMap.values()) {
122122
// Reject client connection for each matching session found
123123
if (session.getClient().getSubsystem().equals(subSystem)) {
124-
InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(eventMeshTCPServer, session,
124+
InetSocketAddress addr = EventMeshTcp2Client.serverGoodby2Client(eventMeshTCPServer.getTcpThreadPoolGroup(), session,
125125
clientSessionGroupMapping);
126126
// Add the remote client address to a list of successfully rejected addresses
127127
if (addr != null) {

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/TCPClientHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void delete(HttpExchange httpExchange) throws IOException {
126126
if (entry.getKey().getHostString().equals(host) && entry.getKey().getPort() == port) {
127127
// Call the serverGoodby2Client method in EventMeshTcp2Client to disconnect the client's connection
128128
EventMeshTcp2Client.serverGoodby2Client(
129-
eventMeshTCPServer,
129+
eventMeshTCPServer.getTcpThreadPoolGroup(),
130130
entry.getValue(),
131131
clientSessionGroupMapping
132132
);

0 commit comments

Comments
 (0)