You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/10/29 18:38:05 UTC
[activemq-artemis] branch master updated: NO-JIRA add acceptor to
handshake timeout msg
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 0ddd55b NO-JIRA add acceptor to handshake timeout msg
new 7561b11 This closes #2873
0ddd55b is described below
commit 0ddd55b2ccdbb182a062a4334318af13e765e891
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Oct 29 10:13:03 2019 -0500
NO-JIRA add acceptor to handshake timeout msg
---
.../org/apache/activemq/artemis/core/protocol/ProtocolHandler.java | 2 +-
.../org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
index 387e9e6..c12aa5a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@@ -116,7 +116,7 @@ public class ProtocolHandler {
public void channelActive(ChannelHandlerContext ctx) throws Exception {
if (handshakeTimeout > 0) {
timeoutFuture = scheduledThreadPool.schedule( () -> {
- ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, ctx.channel().remoteAddress().toString());
+ ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, nettyAcceptor.getName(), ctx.channel().remoteAddress().toString());
ctx.channel().close();
}, handshakeTimeout, TimeUnit.SECONDS);
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 4952fce..0d8a48e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1973,8 +1973,8 @@ public interface ActiveMQServerLogger extends BasicLogger {
void errorAnnouncingBackup(String backupManager);
@LogMessage(level = Logger.Level.ERROR)
- @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking with {1} has occurred.", format = Message.Format.MESSAGE_FORMAT)
- void handshakeTimeout(int timeout, String remoteAddress);
+ @Message(id = 224088, value = "Timeout ({0} seconds) on acceptor \"{1}\" during protocol handshake with {2} has occurred.", format = Message.Format.MESSAGE_FORMAT)
+ void handshakeTimeout(int timeout, String acceptorName, String remoteAddress);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 224089, value = "Failed to calculate persistent size", format = Message.Format.MESSAGE_FORMAT)