From 3af9ca057f31e4802312b557c5f80ab1bc920bb8 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Wed, 29 Aug 2018 14:29:10 -0500 Subject: [PATCH] ARTEMIS-2063 improve logging for address/queue deployment --- .../artemis/core/server/ActiveMQServerLogger.java | 8 ++++++-- .../artemis/core/server/impl/ActiveMQServerImpl.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index b10d652cd31..6aa53f60e54 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -94,8 +94,8 @@ public interface ActiveMQServerLogger extends BasicLogger { void serverStopped(String version, SimpleString nodeId, String uptime); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221003, value = "Deploying queue {0} on address {1}", format = Message.Format.MESSAGE_FORMAT) - void deployQueue(String queueName, String addressName); + @Message(id = 221003, value = "Deploying {2} queue {0} on address {1}", format = Message.Format.MESSAGE_FORMAT) + void deployQueue(String queueName, String addressName, String routingType); @LogMessage(level = Logger.Level.INFO) @Message(id = 221004, value = "{0}", format = Message.Format.MESSAGE_FORMAT) @@ -426,6 +426,10 @@ void slowConsumerDetected(String sessionID, @Message(id = 221079, value = "Ignoring prepare on xid as already called : {0}", format = Message.Format.MESSAGE_FORMAT) void ignoringPrepareOnXidAlreadyCalled(String xid); + @LogMessage(level = Logger.Level.INFO) + @Message(id = 221080, value = "Deploying address {0} supporting {1}", format = Message.Format.MESSAGE_FORMAT) + void deployAddress(String addressName, String routingTypes); + @LogMessage(level = Logger.Level.WARN) @Message(id = 222000, value = "ActiveMQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope", format = Message.Format.MESSAGE_FORMAT) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 054006b9f11..62d3c6e91c8 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -2744,6 +2744,7 @@ private void deployAddressesFromConfiguration(Configuration configuration) throw for (CoreAddressConfiguration config : configuration.getAddressConfigurations()) { AddressInfo info = new AddressInfo(SimpleString.toSimpleString(config.getName()), config.getRoutingTypes()); addOrUpdateAddressInfo(info); + ActiveMQServerLogger.LOGGER.deployAddress(config.getName(), config.getRoutingTypes().toString()); deployQueuesFromListCoreQueueConfiguration(config.getQueueConfigurations()); } } @@ -2751,7 +2752,7 @@ private void deployAddressesFromConfiguration(Configuration configuration) throw private void deployQueuesFromListCoreQueueConfiguration(List queues) throws Exception { for (CoreQueueConfiguration config : queues) { SimpleString queueName = SimpleString.toSimpleString(config.getName()); - ActiveMQServerLogger.LOGGER.deployQueue(config.getName(), config.getAddress()); + ActiveMQServerLogger.LOGGER.deployQueue(config.getName(), config.getAddress(), config.getRoutingType().toString()); AddressSettings as = addressSettingsRepository.getMatch(config.getAddress()); // determine if there is an address::queue match; update it if so int maxConsumers = config.getMaxConsumers() == null ? as.getDefaultMaxConsumers() : config.getMaxConsumers();