diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-12-01 14:22:44 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-12-01 14:22:44 +0000 |
| commit | b6b8b1d803d8dd21ece5969d4ce73fe496330d16 (patch) | |
| tree | 1485e822861feae71876f0d379dd1d13e077c366 /qpid/java/broker/src/main | |
| parent | ec150948e1dbf6279c68cbcdc3289c20e8024a43 (diff) | |
| download | qpid-python-b6b8b1d803d8dd21ece5969d4ce73fe496330d16.tar.gz | |
QPID-2184: replace random 1second wait with a LogMonitor check that the reload has occured. Also update some method and paramter names
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885765 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
2 files changed, 8 insertions, 5 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 441369d064..66a7279134 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 @@ -57,7 +57,8 @@ public class ServerConfiguration implements SignalHandler 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"; - + public static final String SECURITY_CONFIG_RELOADED = "SECURITY CONFIGURATION RELOADED"; + private static final int DEFAULT_FRAME_SIZE = 65536; private static final int DEFAULT_PORT = 5672; private static final int DEFAUL_SSL_PORT = 8672; @@ -297,15 +298,15 @@ public class ServerConfiguration implements SignalHandler { try { - reparseConfigFile(); + reparseConfigFileSecuritySections(); } catch (ConfigurationException e) { - _log.error("Could not reload configuration file", e); + _log.error("Could not reload configuration file security sections", e); } } - public void reparseConfigFile() throws ConfigurationException + public void reparseConfigFileSecuritySections() throws ConfigurationException { if (_configFile != null) { @@ -320,6 +321,8 @@ public class ServerConfiguration implements SignalHandler vhost.getAccessManager().configureGlobalPlugins(_securityConfiguration); vhost.getAccessManager().configureHostPlugins(hostSecurityConfig); } + + _log.warn(SECURITY_CONFIG_RELOADED); } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java index 9954719866..24f8e8878e 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java @@ -42,7 +42,7 @@ public class ConfigurationManagementMBean extends AMQManagedObject implements Co public void reloadSecurityConfiguration() throws Exception { - ApplicationRegistry.getInstance().getConfiguration().reparseConfigFile(); + ApplicationRegistry.getInstance().getConfiguration().reparseConfigFileSecuritySections(); } } |