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

ARTEMIS-601 Reload manager wasn't working with backups

This commit is contained in:
Clebert Suconic 2016-08-11 17:24:37 -04:00
parent a53dd926a5
commit c568a9774f
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
View File

@ -84,6 +84,13 @@ public class Artemis {
System.err.println(cliException.getMessage());
return cliException;
}
catch (NullPointerException e) {
// Yeah.. I really meant System.err..
// this is the CLI and System.out and System.err are common places for interacting with the user
// this is a programming error that must be visualized and corrected
e.printStackTrace();
return e;
}
catch (RuntimeException re) {
System.err.println(re.getMessage());
System.out.println();

9
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
View File

@ -274,6 +274,10 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
@Override
public void activationComplete() {
ReloadManager reloadManager = server.getReloadManager();
if (config != null && config.getConfigurationUrl() != null && reloadManager != null) {
reloadManager.addCallback(config.getConfigurationUrl(), new JMSReloader());
}
}
@ -406,11 +410,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
*/
startCalled = true;
server.start();
ReloadManager reloadManager = server.getReloadManager();
if (config != null && config.getConfigurationUrl() != null && reloadManager != null) {
reloadManager.addCallback(config.getConfigurationUrl(), new JMSReloader());
}
}

13
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -461,12 +461,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
// start connector service
connectorsService = new ConnectorsService(configuration, storageManager, scheduledPool, postOffice, serviceRegistry);
connectorsService.start();
this.reloadManager = new ReloadManagerImpl(getScheduledPool(), configuration.getConfigurationFileRefreshPeriod());
if (configuration.getConfigurationUrl() != null && getScheduledPool() != null) {
reloadManager.addCallback(configuration.getConfigurationUrl(), new ConfigurationFileReloader());
}
}
finally {
// this avoids embedded applications using dirty contexts from startup
@ -1952,6 +1946,13 @@ public class ActiveMQServerImpl implements ActiveMQServer {
deployGroupingHandlerConfiguration(configuration.getGroupingHandlerConfiguration());
this.reloadManager = new ReloadManagerImpl(getScheduledPool(), configuration.getConfigurationFileRefreshPeriod());
if (configuration.getConfigurationUrl() != null && getScheduledPool() != null) {
reloadManager.addCallback(configuration.getConfigurationUrl(), new ConfigurationFileReloader());
}
return true;
}