Author: orudyy
Date: Wed Dec 10 17:34:03 2014
New Revision: 1644491
URL: http://svn.apache.org/r1644491
Log:
QPID-6265: Allow suppression of system out operational logging in broker
starter class
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1644491&r1=1644490&r2=1644491&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Wed Dec 10 17:34:03 2014
@@ -150,19 +150,29 @@ public class Broker implements BrokerShu
String storeLocation = options.getConfigurationStoreLocation();
String storeType = options.getConfigurationStoreType();
- _eventLogger.message(BrokerMessages.CONFIG(storeLocation));
+ if (options.isStartupLoggedToSystemOut())
+ {
+ _eventLogger.message(BrokerMessages.CONFIG(storeLocation));
+ }
//Allow skipping the logging configuration for people who are
//embedding the broker and want to configure it themselves.
if(!options.isSkipLoggingConfiguration())
{
- configureLogging(new File(options.getLogConfigFileLocation()),
options.getLogWatchFrequency());
+ configureLogging(new File(options.getLogConfigFileLocation()),
options.getLogWatchFrequency(), options.isStartupLoggedToSystemOut());
}
// Create the RootLogger to be used during broker operation
boolean statusUpdatesEnabled =
Boolean.parseBoolean(System.getProperty(BrokerProperties.PROPERTY_STATUS_UPDATES,
"true"));
MessageLogger messageLogger = new
Log4jMessageLogger(statusUpdatesEnabled);
_eventLogger.setMessageLogger(messageLogger);
+ // Additionally, report BRK-1006 and BRK-1007 into log4j appenders
+ if(!options.isSkipLoggingConfiguration())
+ {
+ _eventLogger.message(BrokerMessages.LOG_CONFIG(new
File(options.getLogConfigFileLocation()).getAbsolutePath()));
+ }
+
+ _eventLogger.message(BrokerMessages.CONFIG(storeLocation));
PluggableFactoryLoader<SystemConfigFactory> configFactoryLoader = new
PluggableFactoryLoader<>(SystemConfigFactory.class);
SystemConfigFactory configFactory = configFactoryLoader.get(storeType);
@@ -198,12 +208,15 @@ public class Broker implements BrokerShu
}
- private void configureLogging(File logConfigFile, int logWatchTime) throws
InitException, IOException
+ private void configureLogging(File logConfigFile, int logWatchTime,
boolean startupLoggedToSystemOutput) throws InitException, IOException
{
_configuringOwnLogging = true;
if (logConfigFile.exists() && logConfigFile.canRead())
{
-
_eventLogger.message(BrokerMessages.LOG_CONFIG(logConfigFile.getAbsolutePath()));
+ if (startupLoggedToSystemOutput)
+ {
+
_eventLogger.message(BrokerMessages.LOG_CONFIG(logConfigFile.getAbsolutePath()));
+ }
if (logWatchTime > 0)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1644491&r1=1644490&r2=1644491&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
Wed Dec 10 17:34:03 2014
@@ -80,6 +80,7 @@ public class BrokerOptions
private boolean _overwriteConfigurationStore;
private Map<String, String> _configProperties = new
HashMap<String,String>();
private String _initialSystemProperties;
+ private boolean _startupLoggedToSystemOut = true;
public Map<String, Object> convertToSystemConfigAttributes()
{
@@ -95,7 +96,7 @@ public class BrokerOptions
attributes.put(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE,
_managementModeHttpPortOverride);
attributes.put(SystemConfig.MANAGEMENT_MODE_PASSWORD,
_managementModePassword);
attributes.put(SystemConfig.INITIAL_CONFIGURATION_LOCATION,
getInitialConfigurationLocation());
-
+ attributes.put(SystemConfig.STARTUP_LOGGED_TO_SYSTEM_OUT,
isStartupLoggedToSystemOut());
return attributes;
}
@@ -382,4 +383,19 @@ public class BrokerOptions
return _configProperties.get(QPID_HOME_DIR);
}
+ /*
+ * Temporary method for test purposes
+ */
+ public boolean isStartupLoggedToSystemOut()
+ {
+ return _startupLoggedToSystemOut;
+ }
+
+ /*
+ * Temporary method for test purposes
+ */
+ public void setStartupLoggedToSystemOut(boolean startupLoggedToSystemOut)
+ {
+ this._startupLoggedToSystemOut = startupLoggedToSystemOut;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
