diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-07-22 17:09:19 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-07-22 17:09:19 +0000 |
| commit | 24cc42d10857f671423d347aeaa5002d11c5de82 (patch) | |
| tree | e03540abf7a3b24094bccb6a3874209311708a02 /qpid/java/broker/src/main | |
| parent | 7185412d97631d37c6deda80c21e856d36e6d368 (diff) | |
| download | qpid-python-24cc42d10857f671423d347aeaa5002d11c5de82.tar.gz | |
QPID-1992 : Corrected duplication in ServerConfiguration for StatusUpdates and so renamed method getStatusUpdatesEnabled
Ensured tested in ServerConfiguration[File]Test and removed standalone test that replicated functionality.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796798 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
2 files changed, 12 insertions, 12 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 0bb4c050a3..e4ce042891 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -54,6 +54,7 @@ public class ServerConfiguration implements SignalHandler public static final int DEFAULT_BUFFER_READ_LIMIT_SIZE = 262144; public static final int DEFAULT_BUFFER_WRITE_LIMIT_SIZE = 262144; public static final boolean DEFAULT_BROKER_CONNECTOR_PROTECTIO_ENABLED = false; + public static final String DEFAULT_STATUS_UPDATES = "on"; private static final int DEFAULT_FRAME_SIZE = 65536; private static final int DEFAULT_PORT = 5672; @@ -81,6 +82,7 @@ public class ServerConfiguration implements SignalHandler public static final String CONNECTOR_PROTECTIO_ENABLED = "connector.protectio.enabled"; public static final String CONNECTOR_PROTECTIO_READ_BUFFER_LIMIT_SIZE = "connector.protectio.readBufferLimitSize"; public static final String CONNECTOR_PROTECTIO_WRITE_BUFFER_LIMIT_SIZE = "connector.protectio.writeBufferLimitSize"; + public static final String STATUS_UPDATES = "status-updates"; { envVarMap.put("QPID_PORT", "connector.port"); @@ -198,9 +200,16 @@ public class ServerConfiguration implements SignalHandler return conf; } - public boolean getStatusEnabled() + /** + * Check the configuration file to see if status updates are enabled. + * @return true if status updates are enabled + */ + public boolean getStatusUpdatesEnabled() { - return getConfig().getBoolean("status-updates", true); + // Retrieve the setting from configuration but default to on. + String value = getConfig().getString(STATUS_UPDATES, DEFAULT_STATUS_UPDATES); + + return value.equalsIgnoreCase("on"); } // Our configuration class needs to make the interpolate method @@ -557,13 +566,4 @@ public class ServerConfiguration implements SignalHandler getConfig().getLong("housekeeping.expiredMessageCheckPeriod", DEFAULT_HOUSEKEEPING_PERIOD)); } - - public boolean getStatusUpdates() - { - // Retrieve the setting from configuration but default to on. - String value = getConfig().getString("status-updates", "on"); - - return value.equalsIgnoreCase("on"); - } - } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java index 9270c316b6..1c2b4e4046 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java @@ -31,7 +31,7 @@ public class RootMessageLoggerImpl implements RootMessageLogger public RootMessageLoggerImpl(ServerConfiguration configuration, RawMessageLogger rawLogger) { - _enabled = configuration.getStatusUpdates(); + _enabled = configuration.getStatusUpdatesEnabled(); _rawLogger = rawLogger; } |