QPID-5611 : Change the event logger from a singleton to an instance

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575462 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 32 insertions, 30 deletions

diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
index 8b1463b476..284909ce56 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
@@ -22,7 +22,7 @@ package org.apache.qpid.server.jmx;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.KeyStore;
@@ -94,15 +94,20 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
                 : MBeanServerFactory.createMBeanServer(ManagedObject.DOMAIN);
      }
 
+    private EventLogger getEventLogger()
+    {
+        return _broker.getEventLogger();
+    }
+
     @Override
     public void start() throws IOException
     {
-        SystemLog.message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
+        getEventLogger().message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
 
         //check if system properties are set to use the JVM's out-of-the-box JMXAgent
         if (areOutOfTheBoxJMXOptionsSet())
         {
-            SystemLog.message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
+            getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
         }
         else
         {
@@ -136,7 +141,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
                 throw new ServerScopedRuntimeException("Unable to create SSLContext for key store", e);
             }
 
-            SystemLog.message(ManagementConsoleMessages.SSL_KEYSTORE(keyStore.getName()));
+            getEventLogger().message(ManagementConsoleMessages.SSL_KEYSTORE(keyStore.getName()));
 
             //create the SSL RMI socket factories
             csf = new SslRMIClientSocketFactory();
@@ -239,7 +244,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         _cs.setMBeanServerForwarder(mbsf);
 
         // Install a ManagementLogonLogoffReporter so we can report as users logon/logoff
-        ManagementLogonLogoffReporter jmxManagementUserLogonLogoffReporter = new ManagementLogonLogoffReporter(_broker.getRootMessageLogger(), usernameCachingRmiServer);
+        ManagementLogonLogoffReporter jmxManagementUserLogonLogoffReporter = new ManagementLogonLogoffReporter(_broker.getEventLogger(), usernameCachingRmiServer);
         _cs.addNotificationListener(jmxManagementUserLogonLogoffReporter, jmxManagementUserLogonLogoffReporter, null);
 
         // Install the usernameCachingRmiServer as a listener so it may cleanup as clients disconnect
@@ -248,8 +253,8 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         _cs.start();
 
         String connectorServer = (connectorSslEnabled ? "SSL " : "") + "JMX RMIConnectorServer";
-        SystemLog.message(ManagementConsoleMessages.LISTENING(connectorServer, jmxPortConnectorServer));
-        SystemLog.message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
+        getEventLogger().message(ManagementConsoleMessages.LISTENING(connectorServer, jmxPortConnectorServer));
+        getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
     }
 
     private Registry createRmiRegistry(int jmxPortRegistryServer, boolean useCustomRmiRegistry)
@@ -267,7 +272,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
             rmiRegistry = LocateRegistry.createRegistry(jmxPortRegistryServer, null, null);
         }
 
-        SystemLog.message(ManagementConsoleMessages.LISTENING("RMI Registry", jmxPortRegistryServer));
+        getEventLogger().message(ManagementConsoleMessages.LISTENING("RMI Registry", jmxPortRegistryServer));
         return rmiRegistry;
     }
 
@@ -292,7 +297,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
 
         unregisterAllMbeans();
 
-        SystemLog.message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
+        getEventLogger().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
     }
 
     private void closeConnectorAndRegistryServers()
@@ -336,7 +341,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         if (_rmiRegistry != null)
         {
             // Stopping the RMI registry
-            SystemLog.message(ManagementConsoleMessages.SHUTTING_DOWN("RMI Registry", _registryPort.getPort()));
+            getEventLogger().message(ManagementConsoleMessages.SHUTTING_DOWN("RMI Registry", _registryPort.getPort()));
             try
             {
                 boolean success = UnicastRemoteObject.unexportObject(_rmiRegistry, false);
@@ -363,8 +368,8 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
             // Stopping the JMX ConnectorServer
             try
             {
-                SystemLog.message(ManagementConsoleMessages.SHUTTING_DOWN("JMX RMIConnectorServer",
-                                                                          _cs.getAddress().getPort()));
+                getEventLogger().message(ManagementConsoleMessages.SHUTTING_DOWN("JMX RMIConnectorServer",
+                                                                            _cs.getAddress().getPort()));
                 _cs.stop();
             }
             catch (IOException e)
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
index 79d944fc5c..f99fe89f7b 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
@@ -30,8 +30,7 @@ import javax.management.remote.JMXConnectionNotification;
 import javax.security.auth.Subject;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.apache.qpid.server.security.auth.jmx.JMXConnectionPrincipal;
@@ -44,12 +43,12 @@ import java.util.Collections;
 public class ManagementLogonLogoffReporter implements  NotificationListener, NotificationFilter
 {
     private static final Logger LOGGER = Logger.getLogger(ManagementLogonLogoffReporter.class);
-    private final RootMessageLogger _rootMessageLogger;
+    private final EventLogger _eventLogger;
     private final UsernameAccessor _usernameAccessor;
 
-    public ManagementLogonLogoffReporter(RootMessageLogger rootMessageLogger, UsernameAccessor usernameAccessor)
+    public ManagementLogonLogoffReporter(EventLogger eventLogger, UsernameAccessor usernameAccessor)
     {
-        _rootMessageLogger = rootMessageLogger;
+        _eventLogger = eventLogger;
         _usernameAccessor = usernameAccessor;
     }
 
@@ -97,12 +96,12 @@ public class ManagementLogonLogoffReporter implements  NotificationListener, Not
             {
                 if (JMXConnectionNotification.OPENED.equals(type))
                 {
-                    SystemLog.message(ManagementConsoleMessages.OPEN(username));
+                    _eventLogger.message(ManagementConsoleMessages.OPEN(username));
                 }
                 else if (JMXConnectionNotification.CLOSED.equals(type) ||
                          JMXConnectionNotification.FAILED.equals(type))
                 {
-                    SystemLog.message(ManagementConsoleMessages.CLOSE(username));
+                    _eventLogger.message(ManagementConsoleMessages.CLOSE(username));
                 }
                 return null;
             }
diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
index 515a9d88f2..0027815142 100644
--- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
@@ -32,13 +32,11 @@ import static org.mockito.Matchers.anyString;
 
 import javax.management.remote.JMXConnectionNotification;
 
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.logging.MessageLogger;
 
 import junit.framework.TestCase;
-import org.apache.qpid.server.logging.SystemLog;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.mockito.ArgumentMatcher;
 
 public class ManagementLogonLogoffReporterTest extends TestCase
@@ -48,18 +46,18 @@ public class ManagementLogonLogoffReporterTest extends TestCase
 
     private ManagementLogonLogoffReporter _reporter;
     private UsernameAccessor _usernameAccessor;
-    private RootMessageLogger _rootMessageLogger;
+    private MessageLogger _messageLogger;
 
     @Override
     protected void setUp() throws Exception
     {
         super.setUp();
         _usernameAccessor = mock(UsernameAccessor.class);
-        _rootMessageLogger = mock(RootMessageLogger.class);
+        _messageLogger = mock(MessageLogger.class);
         // Enable messaging so we can valid the generated strings
-        when(_rootMessageLogger.isMessageEnabled(anyString())).thenReturn(true);
-        SystemLog.setRootMessageLogger(_rootMessageLogger);
-        _reporter = new ManagementLogonLogoffReporter(_rootMessageLogger, _usernameAccessor);
+        when(_messageLogger.isMessageEnabled(anyString())).thenReturn(true);
+        EventLogger eventLogger = new EventLogger(_messageLogger);
+        _reporter = new ManagementLogonLogoffReporter(eventLogger, _usernameAccessor);
     }
 
     public void testOpenedNotification()
@@ -69,7 +67,7 @@ public class ManagementLogonLogoffReporterTest extends TestCase
 
         _reporter.handleNotification(openNotification, null);
 
-        verify(_rootMessageLogger).message(messageMatch("MNG-1007 : Open : User jmxuser",
+        verify(_messageLogger).message(messageMatch("MNG-1007 : Open : User jmxuser",
                                                         "qpid.message.managementconsole.open"));
     }
 
@@ -93,7 +91,7 @@ public class ManagementLogonLogoffReporterTest extends TestCase
 
         _reporter.handleNotification(closeNotification, null);
 
-        verify(_rootMessageLogger).message(messageMatch("MNG-1008 : Close : User jmxuser", "qpid.message.managementconsole.close"));
+        verify(_messageLogger).message(messageMatch("MNG-1008 : Close : User jmxuser", "qpid.message.managementconsole.close"));
     }
 
     public void tesNotifiedForLogOnTypeEvents()