From d2dc04c712716142de8c27c7b879e22ae257186a Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Wed, 27 Mar 2019 12:00:04 -0500 Subject: [PATCH] ARTEMIS-2288 add remote IP to handshake timeout error --- .../activemq/artemis/core/protocol/ProtocolHandler.java | 2 +- .../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 e68e8141f4..387e9e670e 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); + ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, 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 9ed1419332..a8e9e3d28f 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 @@ -1960,8 +1960,8 @@ public interface ActiveMQServerLogger extends BasicLogger { void errorAnnouncingBackup(String backupManager); @LogMessage(level = Logger.Level.ERROR) - @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking has occurred.", format = Message.Format.MESSAGE_FORMAT) - void handshakeTimeout(int timeout); + @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking with {1} has occurred.", format = Message.Format.MESSAGE_FORMAT) + void handshakeTimeout(int timeout, String remoteAddress); @LogMessage(level = Logger.Level.WARN) @Message(id = 224089, value = "Failed to calculate persistent size", format = Message.Format.MESSAGE_FORMAT)