Author: robbie
Date: Tue Dec 1 14:22:44 2009
New Revision: 885765
URL: http://svn.apache.org/viewvc?rev=885765&view=rev
Log:
QPID-2184: replace random 1second wait with a LogMonitor check that the reload
has occured. Also update some method and paramter names
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=885765&r1=885764&r2=885765&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Tue Dec 1 14:22:44 2009
@@ -57,7 +57,8 @@
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 @@
{
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 @@
vhost.getAccessManager().configureGlobalPlugins(_securityConfiguration);
vhost.getAccessManager().configureHostPlugins(hostSecurityConfig);
}
+
+ _log.warn(SECURITY_CONFIG_RELOADED);
}
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java?rev=885765&r1=885764&r2=885765&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
Tue Dec 1 14:22:44 2009
@@ -42,7 +42,7 @@
public void reloadSecurityConfiguration() throws Exception
{
-
ApplicationRegistry.getInstance().getConfiguration().reparseConfigFile();
+
ApplicationRegistry.getInstance().getConfiguration().reparseConfigFileSecuritySections();
}
}
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=885765&r1=885764&r2=885765&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Tue Dec 1 14:22:44 2009
@@ -877,7 +877,7 @@
// Switch to deny the connection
writeConfigFile(mainFile, true);
- reg.getConfiguration().reparseConfigFile();
+ reg.getConfiguration().reparseConfigFileSecuritySections();
assertTrue(reg.getAccessManager().authoriseConnect(session,
virtualHost));
@@ -995,7 +995,7 @@
out.write("</firewall>\n");
out.close();
- reg.getConfiguration().reparseConfigFile();
+ reg.getConfiguration().reparseConfigFileSecuritySections();
assertTrue(reg.getAccessManager().authoriseConnect(session,
virtualHost));
@@ -1010,7 +1010,7 @@
out.write("</firewall>\n");
out.close();
- reg.getConfiguration().reparseConfigFile();
+ reg.getConfiguration().reparseConfigFileSecuritySections();
assertFalse(reg.getAccessManager().authoriseConnect(session,
virtualHost));
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=885765&r1=885764&r2=885765&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Tue Dec 1 14:22:44 2009
@@ -34,6 +34,7 @@
import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
import org.apache.qpid.server.store.DerbyMessageStore;
import org.apache.qpid.url.URLSyntaxException;
+import org.apache.qpid.util.LogMonitor;
import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,7 +77,8 @@
protected File _configFile = new File(System.getProperty("broker.config"));
protected static final Logger _logger =
LoggerFactory.getLogger(QpidTestCase.class);
-
+ protected static final int LOGMONITOR_TIMEOUT = 5000;
+
protected long RECEIVE_TIMEOUT = 1000l;
private Map<String, String> _propertiesSetForTestOnly = new
HashMap<String, String>();
@@ -1251,7 +1253,7 @@
{
if (_broker.equals(VM))
{
-
ApplicationRegistry.getInstance().getConfiguration().reparseConfigFile();
+
ApplicationRegistry.getInstance().getConfiguration().reparseConfigFileSecuritySections();
}
else // FIXME: should really use the JMX interface to do this
{
@@ -1264,15 +1266,9 @@
String cmd = "/bin/kill -SIGHUP " + reader.readLine();
p = Runtime.getRuntime().exec(cmd);
- //delay to ensure the reload time has time to occur
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- //ignore
- }
+ LogMonitor _monitor = new LogMonitor(_outputFile);
+ assertTrue("The expected server security configuration reload did
not occur",
+
_monitor.waitForMessage(ServerConfiguration.SECURITY_CONFIG_RELOADED,
LOGMONITOR_TIMEOUT));
}
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java?rev=885765&r1=885764&r2=885765&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
Tue Dec 1 14:22:44 2009
@@ -151,9 +151,9 @@
}
- public boolean waitForMessage(String messageCountAlert, long
alertLogWaitPeriod) throws FileNotFoundException, IOException
+ public boolean waitForMessage(String message, long alertLogWaitPeriod)
throws FileNotFoundException, IOException
{
- return waitForMessage(messageCountAlert, alertLogWaitPeriod, true);
+ return waitForMessage(message, alertLogWaitPeriod, true);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
