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

see to gets some more detailed info for jenkins intermittent failures of runtime config mods

This commit is contained in:
gtully 2013-10-02 00:31:11 +01:00
parent 0530aacff7
commit 4a01e40cb4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
View File

@ -220,7 +220,7 @@ public class RuntimeConfigurationBroker extends BrokerFilter {
if (configToMonitor.lastModified() > lastModified) { if (configToMonitor.lastModified() > lastModified) {
applyModifications(configToMonitor); applyModifications(configToMonitor);
} }
} catch (IOException e) { } catch (Throwable e) {
LOG.error("Failed to determine lastModified time on configuration: " + configToMonitor, e); LOG.error("Failed to determine lastModified time on configuration: " + configToMonitor, e);
} }
} }

7
activemq-runtime-config/src/test/java/org/apache/activemq/RuntimeConfigTestSupport.java
View File

@ -52,11 +52,14 @@ public class RuntimeConfigTestSupport {
protected void applyNewConfig(String configName, String newConfigName, long sleep) throws Exception { protected void applyNewConfig(String configName, String newConfigName, long sleep) throws Exception {
Resource resource = Utils.resourceFromString("org/apache/activemq"); Resource resource = Utils.resourceFromString("org/apache/activemq");
FileOutputStream current = new FileOutputStream(new File(resource.getFile(), configName + ".xml")); File file = new File(resource.getFile(), configName + ".xml");
FileOutputStream current = new FileOutputStream(file);
FileInputStream modifications = new FileInputStream(new File(resource.getFile(), newConfigName + ".xml")); FileInputStream modifications = new FileInputStream(new File(resource.getFile(), newConfigName + ".xml"));
modifications.getChannel().transferTo(0, Long.MAX_VALUE, current.getChannel()); modifications.getChannel().transferTo(0, Long.MAX_VALUE, current.getChannel());
current.flush(); current.flush();
LOG.info("Updated: " + current.getChannel()); current.close();
modifications.close();
LOG.info("Updated: " + file);
if (sleep > 0) { if (sleep > 0) {
// wait for mods to kick in // wait for mods to kick in