You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/08/30 22:54:44 UTC
svn commit: r1379139 - in /qpid/trunk/qpid/java:
broker-plugins/management-http/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/
broker-plugi...
Author: kwall
Date: Thu Aug 30 20:54:43 2012
New Revision: 1379139
URL: http://svn.apache.org/viewvc?rev=1379139&view=rev
Log:
QPID-4270: Change web management plugin to log management operational log messages.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF Thu Aug 30 20:54:43 2012
@@ -21,6 +21,7 @@ Import-Package: org.apache.qpid,
org.apache.qpid.server.exchange,
org.apache.qpid.server.logging,
org.apache.qpid.server.logging.actors,
+ org.apache.qpid.server.logging.messages,
org.apache.qpid.server.message,
org.apache.qpid.server.model,
org.apache.qpid.server.model.adapter,
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java Thu Aug 30 20:54:43 2012
@@ -28,6 +28,8 @@ import java.util.Collection;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
import org.apache.qpid.server.management.plugin.servlet.DefinedFileServlet;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.api.ExchangesServlet;
@@ -56,6 +58,7 @@ import org.apache.qpid.server.model.User
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -66,12 +69,13 @@ import org.eclipse.jetty.util.ssl.SslCon
public class Management
{
+ private static final String OPERATIONAL_LOGGING_NAME = "Web";
private final Logger _logger = Logger.getLogger(Management.class);
- private Broker _broker;
+ private final Broker _broker;
- private Collection<Server> _servers = new ArrayList<Server>();
+ private final Collection<Server> _servers = new ArrayList<Server>();
public Management() throws ConfigurationException, IOException
{
@@ -206,28 +210,34 @@ public class Management
public void start() throws Exception
{
+ CurrentActor.get().message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
+
for (Server server : _servers)
{
server.start();
+
+ logOperationalListenMessages(server);
}
+
+ CurrentActor.get().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
}
public void stop() throws Exception
{
for (Server server : _servers)
{
+ logOperationalShutdownMessage(server);
+
server.stop();
}
+
+ CurrentActor.get().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
}
private String getKeyStorePath(IApplicationRegistry appRegistry) throws ConfigurationException, FileNotFoundException
{
- String keyStorePath = null;
- if (System.getProperty("javax.net.ssl.keyStore") != null)
- {
- keyStorePath = System.getProperty("javax.net.ssl.keyStore");
- }
- else
+ String keyStorePath = System.getProperty("javax.net.ssl.keyStore");
+ if (keyStorePath == null)
{
keyStorePath = appRegistry.getConfiguration().getManagementKeyStorePath();
}
@@ -251,4 +261,36 @@ public class Management
return keyStorePath;
}
+ private void logOperationalListenMessages(Server server)
+ {
+ Connector[] connectors = server.getConnectors();
+ for (Connector connector : connectors)
+ {
+ CurrentActor.get().message(ManagementConsoleMessages.LISTENING(stringifyConnectorScheme(connector), connector.getPort()));
+ if (connector instanceof SslSocketConnector)
+ {
+ SslContextFactory sslContextFactory = ((SslSocketConnector)connector).getSslContextFactory();
+ if (sslContextFactory != null && sslContextFactory.getKeyStorePath() != null)
+ {
+ CurrentActor.get().message(ManagementConsoleMessages.SSL_KEYSTORE(sslContextFactory.getKeyStorePath()));
+ }
+ }
+ }
+ }
+
+ private void logOperationalShutdownMessage(Server server)
+ {
+ Connector[] connectors = server.getConnectors();
+ for (Connector connector : connectors)
+ {
+ CurrentActor.get().message(ManagementConsoleMessages.SHUTTING_DOWN(stringifyConnectorScheme(connector), connector.getPort()));
+ }
+ }
+
+ private String stringifyConnectorScheme(Connector connector)
+ {
+ return connector instanceof SslSocketConnector ? "HTTPS" : "HTTP";
+ }
+
+
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java Thu Aug 30 20:54:43 2012
@@ -79,6 +79,8 @@ public class JMXManagedObjectRegistry im
{
private static final Logger _log = Logger.getLogger(JMXManagedObjectRegistry.class);
+ private static final String OPERATIONAL_LOGGING_NAME = "JMX";
+
private final MBeanServer _mbeanServer;
private JMXConnectorServer _cs;
private Registry _rmiRegistry;
@@ -108,12 +110,12 @@ public class JMXManagedObjectRegistry im
public void start() throws IOException, ConfigurationException
{
- CurrentActor.get().message(ManagementConsoleMessages.STARTUP());
+ CurrentActor.get().message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
//check if system properties are set to use the JVM's out-of-the-box JMXAgent
if (areOutOfTheBoxJMXOptionsSet())
{
- CurrentActor.get().message(ManagementConsoleMessages.READY(true));
+ CurrentActor.get().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
return;
}
@@ -359,7 +361,7 @@ public class JMXManagedObjectRegistry im
String connectorServer = (sslEnabled ? "SSL " : "") + "JMX RMIConnectorServer";
CurrentActor.get().message(ManagementConsoleMessages.LISTENING(connectorServer, _jmxPortConnectorServer));
- CurrentActor.get().message(ManagementConsoleMessages.READY(false));
+ CurrentActor.get().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
}
/*
@@ -492,7 +494,7 @@ public class JMXManagedObjectRegistry im
}
}
- CurrentActor.get().message(ManagementConsoleMessages.STOPPED());
+ CurrentActor.get().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java Thu Aug 30 20:54:43 2012
@@ -36,11 +36,11 @@ import java.util.List;
*
* This suite of tests validate that the management console messages occur correctly and according to the following format:
*
- * MNG-1001 : Startup
+ * MNG-1001 : <type> Management Startup
* MNG-1002 : Starting : <service> : Listening on port <Port>
* MNG-1003 : Shutting down : <service> : port <Port>
- * MNG-1004 : Ready
- * MNG-1005 : Stopped
+ * MNG-1004 : <type> Management Ready
+ * MNG-1005 : <type> Management Stopped
* MNG-1006 : Using SSL Keystore : <path>
* MNG-1007 : Open : User <username>
* MNG-1008 : Close : User <username>
@@ -105,7 +105,7 @@ public class ManagementLoggingTest exten
2, results.size());
//3
- assertEquals("Startup log message is not 'Startup'.", "Startup",
+ assertEquals("Startup log message is not 'Startup'.", "JMX Management Startup",
getMessageString(log));
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties Thu Aug 30 20:54:43 2012
@@ -18,16 +18,21 @@
#
# Default File used for all non-defined locales.
#
-STARTUP = MNG-1001 : Startup
+# 0 - Management Type
+STARTUP = MNG-1001 : {0} Management Startup
# 0 - Service
# 1 - Port
LISTENING = MNG-1002 : Starting : {0} : Listening on port {1,number,#}
# 0 - Service
# 1 - Port
SHUTTING_DOWN = MNG-1003 : Shutting down : {0} : port {1,number,#}
-READY = MNG-1004 : Ready[ : Using the platform JMX Agent]
-STOPPED = MNG-1005 : Stopped
+# 0 - Management Type
+READY = MNG-1004 : {0} Management Ready
+# 0 - Management Type
+STOPPED = MNG-1005 : {0} Management Stopped
# 0 - Path
SSL_KEYSTORE = MNG-1006 : Using SSL Keystore : {0}
+# 0 - Username
OPEN = MNG-1007 : Open : User {0}
+# 0 - Username
CLOSE = MNG-1008 : Close : User {0}
\ No newline at end of file
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=1379139&r1=1379138&r2=1379139&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java Thu Aug 30 20:54:43 2012
@@ -29,10 +29,10 @@ public class ManagementConsoleMessagesTe
{
public void testManagementStartup()
{
- _logMessage = ManagementConsoleMessages.STARTUP();
+ _logMessage = ManagementConsoleMessages.STARTUP("My");
List<Object> log = performLog();
- String[] expected = {"Startup"};
+ String[] expected = {"My Management Startup"};
validateLogMessage(log, "MNG-1001", expected);
}
@@ -65,29 +65,20 @@ public class ManagementConsoleMessagesTe
public void testManagementReady()
{
- _logMessage = ManagementConsoleMessages.READY(false);
+ _logMessage = ManagementConsoleMessages.READY("My");
List<Object> log = performLog();
- String[] expected = {"Ready"};
-
- validateLogMessage(log, "MNG-1004", expected);
-
- _logger.clearLogMessages();
-
- _logMessage = ManagementConsoleMessages.READY(true);
- log = performLog();
-
- expected = new String[]{"Ready : Using the platform JMX Agent"};
+ String[] expected = {"My Management Ready"};
validateLogMessage(log, "MNG-1004", expected);
}
public void testManagementStopped()
{
- _logMessage = ManagementConsoleMessages.STOPPED();
+ _logMessage = ManagementConsoleMessages.STOPPED("My");
List<Object> log = performLog();
- String[] expected = {"Stopped"};
+ String[] expected = {"My Management Stopped"};
validateLogMessage(log, "MNG-1005", expected);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org