Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2595

This commit is contained in:
Clebert Suconic 2019-04-02 11:10:11 -04:00
parent 02c0283dcb d2dc04c712
commit 54cfeed918
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
View File

@ -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);
}

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -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)