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

4 files changed, 9 insertions, 21 deletions

diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java
index a9b38e7c2..012d87be5 100644
--- a/base/ca/src/com/netscape/ca/CAService.java
+++ b/base/ca/src/com/netscape/ca/CAService.java
@@ -50,8 +50,8 @@ import com.netscape.certsrv.dbs.ModificationSet;
 import com.netscape.certsrv.dbs.certdb.ICertRecord;
 import com.netscape.certsrv.dbs.certdb.ICertRecordList;
 import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.LogEvent;
 import com.netscape.certsrv.logging.event.SecurityDataArchivalEvent;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.IProfile;
@@ -1159,14 +1159,8 @@ public class CAService implements ICAService, IService {
         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/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index 984971513..3ed73ee1c 100644
--- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -49,9 +49,9 @@ import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.dbs.certdb.IRevocationInfo;
 import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord;
 import com.netscape.certsrv.dbs.crldb.ICRLRepository;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.LogEvent;
 import com.netscape.certsrv.logging.event.DeltaCRLGenerationEvent;
 import com.netscape.certsrv.logging.event.DeltaCRLPublishingEvent;
 import com.netscape.certsrv.logging.event.FullCRLGenerationEvent;
@@ -3190,14 +3190,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
         return subjectID.trim();
     }
 
-    void audit(AuditEvent event) {
-
-        String messageID = event.getMessage();
-        Object[] params = event.getParameters();
-
-        String message = CMS.getLogMessage(messageID, params);
-
-        signedAuditLogger.log(message);
+    void audit(LogEvent event) {
+        signedAuditLogger.log(event);
     }
 }
 
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java
index 8502f44ca..062e7f32c 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java
@@ -399,7 +399,7 @@ public class AuthorityService extends SubsystemService implements AuthorityResou
                 auditor.getSubjectID(),
                 status,
                 auditor.getParamString(ScopeDef.SC_AUTHORITY, op, id, params));
-        auditor.log(msg);
+        signedAuditLogger.log(msg);
     }
 
 }
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
index 8666b9c11..3a68a1c4b 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
@@ -1191,7 +1191,7 @@ public class ProfileService extends SubsystemService implements ProfileResource
                 status,
                 profileId,
                 op);
-        auditor.log(msg);
+        signedAuditLogger.log(msg);
     }
 
     public void auditProfileChange(String scope, String type, String id, String status, Map<String, String> params) {
@@ -1200,7 +1200,7 @@ public class ProfileService extends SubsystemService implements ProfileResource
                 auditor.getSubjectID(),
                 status,
                 auditor.getParamString(scope, type, id, params));
-        auditor.log(msg);
+        signedAuditLogger.log(msg);
     }
 
 }