This closes #2595

apache · Apr 2, 2019 · 54cfeed · 54cfeed
2 parents 02c0283 + d2dc04c
commit 54cfeed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -116,7 +116,7 @@ class ProtocolDecoder extends ByteToMessageDecoder {
       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/...is-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/...is-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1960,8 +1960,8 @@ void slowConsumerDetected(String sessionID,
    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)