Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DB849B1C for ; Mon, 18 Mar 2013 00:37:42 +0000 (UTC) Received: (qmail 64318 invoked by uid 500); 18 Mar 2013 00:37:42 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 64267 invoked by uid 500); 18 Mar 2013 00:37:42 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 64257 invoked by uid 99); 18 Mar 2013 00:37:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 00:37:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 00:37:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4825823888EA; Mon, 18 Mar 2013 00:37:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1457612 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/Broker.java main/java/org/apache/qpid/server/BrokerOptions.java test/java/org/apache/qpid/server/BrokerOptionsTest.java Date: Mon, 18 Mar 2013 00:37:18 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130318003718.4825823888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: robbie Date: Mon Mar 18 00:37:17 2013 New Revision: 1457612 URL: http://svn.apache.org/r1457612 Log: QPID-4655: add BrokerOptions support for skipping the logging configuration (and LoggingManagementMbean registration as a result) when embedding the broker Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java?rev=1457612&r1=1457611&r2=1457612&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java Mon Mar 18 00:37:17 2013 @@ -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()); Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1457612&r1=1457611&r2=1457612&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java Mon Mar 18 00:37:17 2013 @@ -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; + } } Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1457612&r1=1457611&r2=1457612&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original) +++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Mon Mar 18 00:37:17 2013 @@ -186,4 +186,15 @@ public class BrokerOptionsTest extends Q _options.setWorkDir(testWorkDir); assertEquals(testWorkDir, _options.getWorkDir()); } + + public void testDefaultSkipLoggingConfiguration() + { + assertFalse(_options.isSkipLoggingConfiguration()); + } + + public void testOverriddenSkipLoggingConfiguration() + { + _options.setSkipLoggingConfiguration(true); + assertTrue(_options.isSkipLoggingConfiguration()); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org