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

4 files changed, 19 insertions, 17 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 9a4adbc4c7..eed387f8c5 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -33,7 +33,6 @@ import javax.servlet.DispatcherType;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.SystemLog;
 import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
 import org.apache.qpid.server.management.plugin.filter.ForbiddingAuthorisationFilter;
 import org.apache.qpid.server.management.plugin.filter.RedirectingAuthorisationFilter;
@@ -140,7 +139,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
 
     private void start()
     {
-        SystemLog.message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
+        getBroker().getEventLogger().message(ManagementConsoleMessages.STARTUP(OPERATIONAL_LOGGING_NAME));
 
         Collection<Port> httpPorts = getHttpPorts(getBroker().getPorts());
         _server = createServer(httpPorts);
@@ -154,7 +153,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
             throw new ServerScopedRuntimeException("Failed to start HTTP management on ports : " + httpPorts, e);
         }
 
-        SystemLog.message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
+        getBroker().getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
     }
 
     private void stop()
@@ -172,7 +171,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
             }
         }
 
-        SystemLog.message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
+        getBroker().getEventLogger().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
     }
 
     public int getSessionTimeout()
@@ -381,14 +380,14 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
         Connector[] connectors = server.getConnectors();
         for (Connector connector : connectors)
         {
-            SystemLog.message(ManagementConsoleMessages.LISTENING(stringifyConnectorScheme(connector),
+            getBroker().getEventLogger().message(ManagementConsoleMessages.LISTENING(stringifyConnectorScheme(connector),
                                                                   connector.getPort()));
             if (connector instanceof SslSocketConnector)
             {
                 SslContextFactory sslContextFactory = ((SslSocketConnector)connector).getSslContextFactory();
                 if (sslContextFactory != null && sslContextFactory.getKeyStorePath() != null)
                 {
-                    SystemLog.message(ManagementConsoleMessages.SSL_KEYSTORE(sslContextFactory.getKeyStorePath()));
+                    getBroker().getEventLogger().message(ManagementConsoleMessages.SSL_KEYSTORE(sslContextFactory.getKeyStorePath()));
                 }
             }
         }
@@ -399,7 +398,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
         Connector[] connectors = server.getConnectors();
         for (Connector connector : connectors)
         {
-            SystemLog.message(ManagementConsoleMessages.SHUTTING_DOWN(stringifyConnectorScheme(connector),
+            getBroker().getEventLogger().message(ManagementConsoleMessages.SHUTTING_DOWN(stringifyConnectorScheme(connector),
                                                                       connector.getPort()));
         }
     }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
index 023453e74f..563e49d43f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
@@ -136,7 +136,8 @@ public class HttpManagementUtil
         session.setAttribute(ATTR_SUBJECT, subject);
 
         // Cause the user logon to be logged.
-        session.setAttribute(ATTR_LOGIN_LOGOUT_REPORTER, new LoginLogoutReporter(subject));
+        session.setAttribute(ATTR_LOGIN_LOGOUT_REPORTER,
+                             new LoginLogoutReporter(subject, getBroker(session.getServletContext()).getEventLogger()));
     }
 
     public static Subject tryToAuthenticate(HttpServletRequest request, HttpManagementConfiguration managementConfig)
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
index 5155654e82..b980b83510 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
 import org.apache.log4j.Logger;
-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;
 
@@ -42,12 +42,14 @@ public class LoginLogoutReporter implements HttpSessionBindingListener
     private static final Logger LOGGER = Logger.getLogger(LoginLogoutReporter.class);
     private final Subject _subject;
     private final Principal _principal;
+    private final EventLogger _eventLogger;
 
-    public LoginLogoutReporter(Subject subject)
+    public LoginLogoutReporter(Subject subject, EventLogger eventLogger)
     {
         super();
         _subject = subject;
         _principal = AuthenticatedPrincipal.getAuthenticatedPrincipalFromSubject(_subject);
+        _eventLogger = eventLogger;
     }
 
     @Override
@@ -74,7 +76,7 @@ public class LoginLogoutReporter implements HttpSessionBindingListener
             @Override
             public Void run()
             {
-                SystemLog.message(ManagementConsoleMessages.OPEN(_principal.getName()));
+                _eventLogger.message(ManagementConsoleMessages.OPEN(_principal.getName()));
                 return null;
             }
         });
@@ -92,7 +94,7 @@ public class LoginLogoutReporter implements HttpSessionBindingListener
             @Override
             public Void run()
             {
-                SystemLog.message(ManagementConsoleMessages.CLOSE(_principal.getName()));
+                _eventLogger.message(ManagementConsoleMessages.CLOSE(_principal.getName()));
                 return null;
             }
         });
diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
index 16ae5220ab..58bd42ef5f 100644
--- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
@@ -28,9 +28,9 @@ import static org.mockito.Mockito.when;
 
 import javax.security.auth.Subject;
 
+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.SystemLog;
+import org.apache.qpid.server.logging.MessageLogger;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.mockito.ArgumentMatcher;
 
@@ -40,7 +40,7 @@ public class LoginLogoutReporterTest extends TestCase
 {
     private LoginLogoutReporter _loginLogoutReport;
     private Subject _subject = new Subject();
-    private RootMessageLogger _logger = mock(RootMessageLogger.class);
+    private MessageLogger _logger = mock(MessageLogger.class);
 
     @Override
     protected void setUp() throws Exception
@@ -50,8 +50,8 @@ public class LoginLogoutReporterTest extends TestCase
         _subject.getPrincipals().add(new AuthenticatedPrincipal("mockusername"));
         when(_logger.isEnabled()).thenReturn(true);
         when(_logger.isMessageEnabled(anyString())).thenReturn(true);
-        SystemLog.setRootMessageLogger(_logger);
-        _loginLogoutReport = new LoginLogoutReporter(_subject);
+        EventLogger eventLogger = new EventLogger(_logger);
+        _loginLogoutReport = new LoginLogoutReporter(_subject, eventLogger);
     }
 
     public void testLoginLogged()