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

Merge PR #123

This commit is contained in:
Martyn Taylor 2015-02-27 11:38:01 +00:00
parent a895bf3344 695c1cd46c
commit 5079dfd649
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
View File

@ -96,6 +96,8 @@ public class NettyAcceptor implements Acceptor
// Disable resource leak detection for performance reasons by default // Disable resource leak detection for performance reasons by default
ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED);
} }
//just for debug
private final String protocolsString;
private final String name; private final String name;
@ -206,6 +208,8 @@ public class NettyAcceptor implements Acceptor
this.protocolHandler = new ProtocolHandler(protocolMap, this, configuration, scheduledThreadPool); this.protocolHandler = new ProtocolHandler(protocolMap, this, configuration, scheduledThreadPool);
this.protocolsString = getProtocols(protocolMap);
host = ConfigurationHelper.getStringProperty(TransportConstants.HOST_PROP_NAME, host = ConfigurationHelper.getStringProperty(TransportConstants.HOST_PROP_NAME,
TransportConstants.DEFAULT_HOST, TransportConstants.DEFAULT_HOST,
configuration); configuration);
@ -478,7 +482,7 @@ public class NettyAcceptor implements Acceptor
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
} }
ActiveMQServerLogger.LOGGER.startedNettyAcceptor(TransportConstants.NETTY_VERSION, host, port); ActiveMQServerLogger.LOGGER.startedNettyAcceptor(TransportConstants.NETTY_VERSION, host, port, protocolsString);
} }
} }
@ -666,6 +670,23 @@ public class NettyAcceptor implements Acceptor
return new ActiveMQServerChannelHandler(channelGroup, handler, new Listener()); return new ActiveMQServerChannelHandler(channelGroup, handler, new Listener());
} }
private static String getProtocols(Map<String, ProtocolManager> protocolManager)
{
StringBuilder sb = new StringBuilder();
if (protocolManager != null)
{
Set<String> strings = protocolManager.keySet();
for (String string : strings)
{
if (sb.length() > 0)
{
sb.append(",");
}
sb.append(string);
}
}
return sb.toString();
}
// Inner classes ----------------------------------------------------------------------------- // Inner classes -----------------------------------------------------------------------------
private final class ActiveMQServerChannelHandler extends ActiveMQChannelHandler implements ConnectionCreator private final class ActiveMQServerChannelHandler extends ActiveMQChannelHandler implements ConnectionCreator

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

@ -167,8 +167,8 @@ public interface ActiveMQServerLogger extends BasicLogger
void journalUnreferencedMessage(Long messageID); void journalUnreferencedMessage(Long messageID);
@LogMessage(level = Logger.Level.INFO) @LogMessage(level = Logger.Level.INFO)
@Message(id = 221020, value = "Started Netty Acceptor version {0} {1}:{2,number,#}", format = Message.Format.MESSAGE_FORMAT) @Message(id = 221020, value = "Started Netty Acceptor version {0} {1}:{2,number,#} for protocols [{3}]", format = Message.Format.MESSAGE_FORMAT)
void startedNettyAcceptor(String id, String host, Integer port); void startedNettyAcceptor(String id, String host, Integer port, String enabledProtocols);
@LogMessage(level = Logger.Level.INFO) @LogMessage(level = Logger.Level.INFO)
@Message(id = 221021, value = "failed to remove connection", format = Message.Format.MESSAGE_FORMAT) @Message(id = 221021, value = "failed to remove connection", format = Message.Format.MESSAGE_FORMAT)