You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/08/29 20:32:32 UTC
activemq-artemis git commit: ARTEMIS-2063 improve logging for
address/queue deployment
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x 2031515e0 -> 4f76ef47c
ARTEMIS-2063 improve logging for address/queue deployment
(cherry picked from commit 3af9ca057f31e4802312b557c5f80ab1bc920bb8)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4f76ef47
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4f76ef47
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4f76ef47
Branch: refs/heads/2.6.x
Commit: 4f76ef47c05595b14740df2368859485f6dcab97
Parents: 2031515
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Aug 29 14:29:10 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 29 16:32:26 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 8 ++++++--
.../artemis/core/server/impl/ActiveMQServerImpl.java | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4f76ef47/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
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 1e34282..6b79672 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 @@ public interface ActiveMQServerLogger extends BasicLogger {
@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)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4f76ef47/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
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 59a6664..1e56af4 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
@@ -2532,6 +2532,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
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());
}
}
@@ -2539,7 +2540,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private void deployQueuesFromListCoreQueueConfiguration(List<CoreQueueConfiguration> 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 maxConsumerAddressSetting = as.getDefaultMaxConsumers();