activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-947 reload <addresses> on broker.xml change
Date Tue, 07 Feb 2017 22:09:18 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a39b9e55e -> ba784281d


ARTEMIS-947 reload <addresses> on broker.xml change


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f5599c66
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f5599c66
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f5599c66

Branch: refs/heads/master
Commit: f5599c6630d01e7872e227a1ceef32dacb9f7c3c
Parents: a39b9e5
Author: Justin Bertram <jbertram@apache.org>
Authored: Tue Feb 7 13:45:24 2017 -0600
Committer: Justin Bertram <jbertram@apache.org>
Committed: Tue Feb 7 13:45:24 2017 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java  | 6 ++++++
 docs/user-manual/en/config-reload.md                           | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f5599c66/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 7575100..a2ef3e6 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
@@ -2226,6 +2226,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
    }
 
    private void deployAddressesFromConfiguration() throws Exception {
+      deployAddressesFromConfiguration(configuration);
+   }
+
+   private void deployAddressesFromConfiguration(Configuration configuration) throws Exception
{
       for (CoreAddressConfiguration config : configuration.getAddressConfigurations()) {
          AddressInfo info = new AddressInfo(SimpleString.toSimpleString(config.getName()),
config.getRoutingTypes());
          addOrUpdateAddressInfo(info);
@@ -2719,6 +2723,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
                deployDivert(divertConfig);
             }
          }
+         ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses");
+         deployAddressesFromConfiguration(config);
       }
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f5599c66/docs/user-manual/en/config-reload.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/config-reload.md b/docs/user-manual/en/config-reload.md
index 50d9c25..1fba9d6 100644
--- a/docs/user-manual/en/config-reload.md
+++ b/docs/user-manual/en/config-reload.md
@@ -6,8 +6,8 @@ Once the configuration file is changed (broker.xml) the following modules
will b
 
 - Address Settings
 - Security Settings
-- JMS Queues
-- JMS Topics
+- Diverts
+- Addresses & queues
 
 
-Notice: Queues and Topics won't be removed upon reload, given the risk of losing messages.
You may execute explicit CLI or Management operations to remove destinations.
\ No newline at end of file
+Notice: Address & queues won't be removed upon reload, given the risk of losing messages.
You may execute explicit CLI or Management operations to remove destinations.
\ No newline at end of file


Mime
View raw message