Consolidated log() for audit events.

Duplicate log() methods for audit events have been merged into the
Logger class.

https://pagure.io/dogtagpki/issue/2689

Change-Id: I7a5147ff3221a52a82e69f56faf2156c04256db2

2 files changed, 13 insertions, 20 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
index 84ac2ea31..56a5f44f7 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -64,9 +64,9 @@ import com.netscape.certsrv.common.ICMSRequest;
 import com.netscape.certsrv.dbs.certdb.ICertRecord;
 import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.logging.LogCategory;
+import com.netscape.certsrv.logging.LogEvent;
 import com.netscape.certsrv.logging.LogSource;
 import com.netscape.certsrv.logging.event.AuthFailEvent;
 import com.netscape.certsrv.logging.event.AuthSuccessEvent;
@@ -117,7 +117,7 @@ import netscape.security.x509.X509CertImpl;
  */
 public abstract class CMSServlet extends HttpServlet {
 
-    private static Logger signedAuditLogger = SignedAuditLogger.getLogger();
+    protected static Logger signedAuditLogger = SignedAuditLogger.getLogger();
 
     private static final long serialVersionUID = -3886300199374147160L;
     // servlet init params
@@ -2026,14 +2026,8 @@ public abstract class CMSServlet extends HttpServlet {
         signedAuditLogger.log(msg);
     }
 
-    protected void audit(AuditEvent event) {
-
-        String template = event.getMessage();
-        Object[] params = event.getParameters();
-
-        String message = CMS.getLogMessage(template, params);
-
-        audit(message);
+    protected void audit(LogEvent event) {
+        signedAuditLogger.log(event);
     }
 
     /**
diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java b/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java
index 40a8791ed..350ae06b1 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java
@@ -31,10 +31,15 @@ import com.netscape.certsrv.authorization.IAuthzSubsystem;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.IAuditor;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.LogEvent;
 import com.netscape.certsrv.logging.LogSource;
+import com.netscape.cms.logging.Logger;
+import com.netscape.cms.logging.SignedAuditLogger;
 
 public class SubsystemService extends PKIService {
 
+    protected static Logger signedAuditLogger = SignedAuditLogger.getLogger();
+
     protected IAuthzSubsystem authz = (IAuthzSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_AUTHZ);
     protected IAuditor auditor = CMS.getAuditor();
     protected ILogger logger = CMS.getLogger();
@@ -82,14 +87,8 @@ public class SubsystemService extends PKIService {
                 getClass().getSimpleName() + ": " + message);
     }
 
-    protected void audit(AuditEvent event) {
-
-        String template = event.getMessage();
-        Object[] params = event.getParameters();
-
-        String message = CMS.getLogMessage(template, params);
-
-        auditor.log(message);
+    protected void audit(LogEvent event) {
+        signedAuditLogger.log(event);
     }
 
     public void audit(String message, String scope, String type, String id, Map<String, String> params, String status) {
@@ -100,7 +99,7 @@ public class SubsystemService extends PKIService {
                 status,
                 auditor.getParamString(scope, type, id, params));
 
-        auditor.log(auditMessage);
+        signedAuditLogger.log(auditMessage);
     }
 
     public void auditConfigTokenGeneral(String status, String service, Map<String, String> params, String info) {
@@ -112,6 +111,6 @@ public class SubsystemService extends PKIService {
                 service,
                 auditor.getParamString(null, params),
                 info);
-        auditor.log(msg);
+        signedAuditLogger.log(msg);
     }
 }