Author: orudyy
Date: Wed Feb 4 17:46:45 2015
New Revision: 1657341
URL: http://svn.apache.org/r1657341
Log:
QPID-6356: Add port transport into operational log message for starting
managegement plugins
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java?rev=1657341&r1=1657340&r2=1657341&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
Wed Feb 4 17:46:45 2015
@@ -100,16 +100,16 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1002 : Starting : {0} : Listening on port {1,number,#}</pre>
+ * <pre>MNG-1002 : Starting : {0} : Listening on {1} port
{2,number,#}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage LISTENING(String param1, Number param2)
+ public static LogMessage LISTENING(String param1, String param2, Number
param3)
{
String rawMessage = _messages.getString("LISTENING");
- final Object[] messageArguments = {param1, param2};
+ final Object[] messageArguments = {param1, param2, param3};
// Create a new MessageFormat to ensure thread safety.
// Sharing a MessageFormat and using applyPattern is not thread safe
MessageFormat formatter = new MessageFormat(rawMessage,
_currentLocale);
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties?rev=1657341&r1=1657340&r2=1657341&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
Wed Feb 4 17:46:45 2015
@@ -22,7 +22,7 @@
STARTUP = MNG-1001 : {0} Management Startup
# 0 - Service
# 1 - Port
-LISTENING = MNG-1002 : Starting : {0} : Listening on port {1,number,#}
+LISTENING = MNG-1002 : Starting : {0} : Listening on {1} port {2,number,#}
# 0 - Service
# 1 - Port
SHUTTING_DOWN = MNG-1003 : Shutting down : {0} : port {1,number,#}
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=1657341&r1=1657340&r2=1657341&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
Wed Feb 4 17:46:45 2015
@@ -22,6 +22,8 @@ package org.apache.qpid.server.logging.m
import java.util.List;
+import org.apache.qpid.server.model.Transport;
+
/**
* Test MNG Log Messages
*/
@@ -39,13 +41,13 @@ public class ManagementConsoleMessagesTe
public void testManagementListening()
{
- String transport = "JMX";
+ String management = "JMX";
Integer port = 8889;
- _logMessage = ManagementConsoleMessages.LISTENING(transport, port);
+ _logMessage = ManagementConsoleMessages.LISTENING(management,
Transport.TCP.name(), port);
List<Object> log = performLog();
- String[] expected = {"Starting :", transport, ": Listening on port",
String.valueOf(port)};
+ String[] expected = {"Starting :", management, ": Listening on ",
Transport.TCP.name(), " port", String.valueOf(port)};
validateLogMessage(log, "MNG-1002", expected);
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1657341&r1=1657340&r2=1657341&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Wed Feb 4 17:46:45 2015
@@ -46,7 +46,6 @@ import org.eclipse.jetty.server.SessionM
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -139,7 +138,7 @@ public class HttpManagement extends Abst
try
{
_server.start();
- logOperationalListenMessages(_server);
+ logOperationalListenMessages(httpPorts);
}
catch (Exception e)
{
@@ -448,13 +447,15 @@ public class HttpManagement extends Abst
root.addServlet(servletHolder, "/api/v" +
BrokerModel.MODEL_MAJOR_VERSION + "/" + name + "/*");
}
- private void logOperationalListenMessages(Server server)
+ private void logOperationalListenMessages(Collection<Port<?>> ports)
{
- Connector[] connectors = server.getConnectors();
- for (Connector connector : connectors)
+ for (Port port : ports)
{
-
getBroker().getEventLogger().message(ManagementConsoleMessages.LISTENING(stringifyConnectorScheme(connector),
-
connector.getPort()));
+ Set<Transport> transports = port.getTransports();
+ for (Transport transport: transports)
+ {
+
getBroker().getEventLogger().message(ManagementConsoleMessages.LISTENING(Protocol.HTTP.name(),
transport.name(), port.getPort()));
+ }
}
}
@@ -463,15 +464,10 @@ public class HttpManagement extends Abst
Connector[] connectors = server.getConnectors();
for (Connector connector : connectors)
{
-
getBroker().getEventLogger().message(ManagementConsoleMessages.SHUTTING_DOWN(stringifyConnectorScheme(connector),
-
connector.getPort()));
+
getBroker().getEventLogger().message(ManagementConsoleMessages.SHUTTING_DOWN(Protocol.HTTP.name(),
connector.getPort()));
}
}
- private String stringifyConnectorScheme(Connector connector)
- {
- return connector instanceof SslSocketConnector ? "HTTPS" : "HTTP";
- }
private Collection<Port<?>> getHttpPorts(Collection<Port<?>> ports)
{
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=1657341&r1=1657340&r2=1657341&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
Wed Feb 4 17:46:45 2015
@@ -36,6 +36,7 @@ import java.rmi.server.RMIServerSocketFa
import java.rmi.server.UnicastRemoteObject;
import java.security.GeneralSecurityException;
import java.util.HashMap;
+import java.util.Set;
import javax.management.JMException;
import javax.management.MBeanServer;
@@ -250,8 +251,12 @@ public class JMXManagedObjectRegistry im
_cs.start();
- String connectorServer = (connectorSslEnabled ? "SSL " : "") + "JMX
RMIConnectorServer";
-
getEventLogger().message(ManagementConsoleMessages.LISTENING(connectorServer,
jmxPortConnectorServer));
+ Set<Transport> connectorTransports = _connectorPort.getTransports();
+ for (Transport transport: connectorTransports)
+ {
+ getEventLogger().message(ManagementConsoleMessages.LISTENING("JMX
RMIConnectorServer", transport.name(), jmxPortConnectorServer));
+ }
+
getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
}
@@ -261,7 +266,7 @@ public class JMXManagedObjectRegistry im
final RMIServerSocketFactory ssf =
getRmiServerSocketFactory(useCustomRmiRegistry);
Registry rmiRegistry =
LocateRegistry.createRegistry(jmxPortRegistryServer, null, ssf);
- getEventLogger().message(ManagementConsoleMessages.LISTENING("RMI
Registry", jmxPortRegistryServer));
+ getEventLogger().message(ManagementConsoleMessages.LISTENING("RMI
Registry", Transport.TCP.name(), jmxPortRegistryServer));
return rmiRegistry;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
