diff options
Diffstat (limited to 'qpid/java')
3 files changed, 29 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java index 2043b2cd67..d1be4213ec 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java @@ -115,8 +115,13 @@ public class Broker CurrentActor.get().message(BrokerMessages.CONFIG(storeLocation)); - File logConfigFile = getConfigFile(options.getLogConfigFile(), BrokerOptions.DEFAULT_LOG_CONFIG_FILE, qpidHome, false); - configureLogging(logConfigFile, options.getLogWatchFrequency()); + //Allow skipping the logging configuration for people who are + //embedding the broker and want to configure it themselves. + if(!options.isSkipLoggingConfiguration()) + { + File logConfigFile = getConfigFile(options.getLogConfigFile(), BrokerOptions.DEFAULT_LOG_CONFIG_FILE, qpidHome, false); + configureLogging(logConfigFile, options.getLogWatchFrequency()); + } BrokerConfigurationStoreCreator storeCreator = new BrokerConfigurationStoreCreator(); ConfigurationEntryStore store = storeCreator.createStore(storeLocation, storeType, options.getInitialConfigurationLocation()); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java index 23975ca6d5..289cfebc29 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java @@ -47,6 +47,7 @@ public class BrokerOptions private int _managementModeConnectorPort; private int _managementModeHttpPort; private String _workingDir; + private boolean _skipLoggingConfiguration; public String getLogConfigFile() { @@ -228,4 +229,14 @@ public class BrokerOptions { _initialConfigurationLocation = initialConfigurationLocation; } + + public boolean isSkipLoggingConfiguration() + { + return _skipLoggingConfiguration; + } + + public void setSkipLoggingConfiguration(boolean skipLoggingConfiguration) + { + _skipLoggingConfiguration = skipLoggingConfiguration; + } } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java index 7a7df66c57..51fe2d88d3 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java @@ -186,4 +186,15 @@ public class BrokerOptionsTest extends QpidTestCase _options.setWorkDir(testWorkDir); assertEquals(testWorkDir, _options.getWorkDir()); } + + public void testDefaultSkipLoggingConfiguration() + { + assertFalse(_options.isSkipLoggingConfiguration()); + } + + public void testOverriddenSkipLoggingConfiguration() + { + _options.setSkipLoggingConfiguration(true); + assertTrue(_options.isSkipLoggingConfiguration()); + } } |