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 2022/12/04 13:16:59 UTC
[incubator-eventmesh] branch master updated: fix issue2370
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 5adb3c647 fix issue2370
new 2730a4570 Merge pull request #2445 from jonyangx/issue2370
5adb3c647 is described below
commit 5adb3c6478f9d0d13dd72dd21a67a27e68c4d553
Author: jonyangx <ya...@gmail.com>
AuthorDate: Sun Dec 4 09:12:36 2022 +0800
fix issue2370
---
.../protocol/tcp/client/EventMeshTcp2Client.java | 62 ++++++++++------------
1 file changed, 28 insertions(+), 34 deletions(-)
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
index 35f17aad1..f31397120 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/EventMeshTcp2Client.java
@@ -44,17 +44,17 @@ import io.netty.channel.ChannelHandlerContext;
public class EventMeshTcp2Client {
- private static final Logger logger = LoggerFactory.getLogger(EventMeshTcp2Client.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EventMeshTcp2Client.class);
- public static InetSocketAddress serverGoodby2Client(EventMeshTCPServer eventMeshTCPServer, Session session,
+ public static InetSocketAddress serverGoodby2Client(EventMeshTCPServer eventMeshTCPServer,
+ Session session,
ClientSessionGroupMapping mapping) {
- logger.info("serverGoodby2Client client[{}]", session.getClient());
+ LOGGER.info("serverGoodby2Client client[{}]", session.getClient());
try {
long startTime = System.currentTimeMillis();
Package msg = new Package();
- msg.setHeader(
- new Header(SERVER_GOODBYE_REQUEST, OPStatus.SUCCESS.getCode(), "graceful normal quit from eventmesh",
- null));
+ msg.setHeader(new Header(SERVER_GOODBYE_REQUEST, OPStatus.SUCCESS.getCode(),
+ "graceful normal quit from eventmesh", null));
eventMeshTCPServer.getScheduler().submit(new Runnable() {
@Override
@@ -68,15 +68,13 @@ public class EventMeshTcp2Client {
closeSessionIfTimeout(eventMeshTCPServer, session, mapping);
return address;
} catch (Exception e) {
- logger.error("exception occur while serverGoodby2Client", e);
+ LOGGER.error("exception occur while serverGoodby2Client", e);
return null;
}
}
- public static InetSocketAddress goodBye2Client(EventMeshTCPServer eventMeshTCPServer,
- Session session,
- String errMsg,
- int eventMeshStatus,
+ public static InetSocketAddress goodBye2Client(EventMeshTCPServer eventMeshTCPServer, Session session,
+ String errMsg, int eventMeshStatus,
ClientSessionGroupMapping mapping) {
try {
long startTime = System.currentTimeMillis();
@@ -94,38 +92,34 @@ public class EventMeshTcp2Client {
return session.getRemoteAddress();
} catch (Exception e) {
- logger.error("exception occur while goodbye2client", e);
+ LOGGER.error("exception occur while goodbye2client", e);
return null;
}
}
- public static void goodBye2Client(ChannelHandlerContext ctx,
- String errMsg,
- ClientSessionGroupMapping mapping,
+ public static void goodBye2Client(ChannelHandlerContext ctx, String errMsg, ClientSessionGroupMapping mapping,
EventMeshTcpMonitor eventMeshTcpMonitor) {
long startTime = System.currentTimeMillis();
Package pkg = new Package(new Header(SERVER_GOODBYE_REQUEST, OPStatus.FAIL.getCode(), errMsg, null));
eventMeshTcpMonitor.getTcpSummaryMetrics().getEventMesh2clientMsgNum().incrementAndGet();
- logger.info("goodBye2Client client[{}]", RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
- ctx.writeAndFlush(pkg).addListener(
- new ChannelFutureListener() {
- @Override
- public void operationComplete(ChannelFuture future) throws Exception {
- Utils.logSucceedMessageFlow(pkg, null, startTime, startTime);
- try {
- mapping.closeSession(ctx);
- } catch (Exception e) {
- logger.warn("close session failed!", e);
- }
- }
+ LOGGER.info("goodBye2Client client[{}]", RemotingHelper.parseChannelRemoteAddr(ctx.channel()));
+ ctx.writeAndFlush(pkg).addListener(new ChannelFutureListener() {
+ @Override
+ public void operationComplete(ChannelFuture future) throws Exception {
+ Utils.logSucceedMessageFlow(pkg, null, startTime, startTime);
+ try {
+ mapping.closeSession(ctx);
+ } catch (Exception e) {
+ LOGGER.warn("close session failed!", e);
}
- );
+ }
+ });
}
public static String redirectClient2NewEventMesh(EventMeshTCPServer eventMeshTCPServer, String newEventMeshIp,
int port, Session session, ClientSessionGroupMapping mapping) {
- logger.info("begin to gracefully redirect Client {}, newIPPort[{}]", session.getClient(),
- newEventMeshIp + ":" + port);
+ LOGGER.info("begin to gracefully redirect Client {}, newIPPort[{}]", session.getClient(), newEventMeshIp + ":"
+ + port);
try {
long startTime = System.currentTimeMillis();
@@ -142,7 +136,7 @@ public class EventMeshTcp2Client {
closeSessionIfTimeout(eventMeshTCPServer, session, mapping);
return session.getRemoteAddress() + "--->" + newEventMeshIp + ":" + port;
} catch (Exception e) {
- logger.error("exception occur while redirectClient2NewEventMesh", e);
+ LOGGER.error("exception occur while redirectClient2NewEventMesh", e);
return null;
}
}
@@ -153,12 +147,12 @@ public class EventMeshTcp2Client {
@Override
public void run() {
try {
- if (!session.getSessionState().equals(SessionState.CLOSED)) {
+ if (session.getSessionState() != SessionState.CLOSED) {
mapping.closeSession(session.getContext());
- logger.info("closeSessionIfTimeout success, session[{}]", session.getClient());
+ LOGGER.info("closeSessionIfTimeout success, session[{}]", session.getClient());
}
} catch (Exception e) {
- logger.error("close session failed", e);
+ LOGGER.error("close session failed", e);
}
}
}, 30 * 1000, TimeUnit.MILLISECONDS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org