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

ARTEMIS-2288 add remote IP to handshake timeout error

This commit is contained in:
Justin Bertram 2019-03-27 12:00:04 -05:00 committed by Clebert Suconic
parent 02c0283dcb
commit d2dc04c712
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 { public void channelActive(ChannelHandlerContext ctx) throws Exception {
if (handshakeTimeout > 0) { if (handshakeTimeout > 0) {
timeoutFuture = scheduledThreadPool.schedule( () -> { timeoutFuture = scheduledThreadPool.schedule( () -> {
ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout); ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, ctx.channel().remoteAddress().toString());
ctx.channel().close(); ctx.channel().close();
}, handshakeTimeout, TimeUnit.SECONDS); }, 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); void errorAnnouncingBackup(String backupManager);
@LogMessage(level = Logger.Level.ERROR) @LogMessage(level = Logger.Level.ERROR)
@Message(id = 224088, value = "Timeout ({0} seconds) while handshaking has occurred.", format = Message.Format.MESSAGE_FORMAT) @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking with {1} has occurred.", format = Message.Format.MESSAGE_FORMAT)
void handshakeTimeout(int timeout); void handshakeTimeout(int timeout, String remoteAddress);
@LogMessage(level = Logger.Level.WARN) @LogMessage(level = Logger.Level.WARN)
@Message(id = 224089, value = "Failed to calculate persistent size", format = Message.Format.MESSAGE_FORMAT) @Message(id = 224089, value = "Failed to calculate persistent size", format = Message.Format.MESSAGE_FORMAT)