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

NO-JIRA add acceptor to handshake timeout msg

This commit is contained in:
Justin Bertram 2019-10-29 10:13:03 -05:00 committed by Clebert Suconic
parent eb3c4931c2
commit 0ddd55b2cc
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, ctx.channel().remoteAddress().toString());
ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, nettyAcceptor.getName(), 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

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