The AuditCLI has been modified to create the AuditClient with lazy
initialization.
Pushed to master under trivial rule.
--
Endi S. Dewata
>From 6749f6bffe92743373d4b86bbd05e5a957e74d96 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Fri, 31 Mar 2017 18:42:56 +0200
Subject: [PATCH] Refactored AuditCLI.
The AuditCLI has been modified to create the AuditClient with lazy
initialization.
Change-Id: I61b08e92a2f2de983fc77513dde89e1d5e1254b9
---
base/common/src/com/netscape/certsrv/tps/TPSClient.java | 2 --
.../java-tools/src/com/netscape/cmstools/logging/AuditCLI.java | 10 +++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/base/common/src/com/netscape/certsrv/tps/TPSClient.java b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
index da0022520c90ee6e265fe19b554d15cc602bcca4..19273f7e4bfa1fc823f12915942121d6fc4abcf3 100644
--- a/base/common/src/com/netscape/certsrv/tps/TPSClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/TPSClient.java
@@ -23,7 +23,6 @@ import com.netscape.certsrv.client.PKIClient;
import com.netscape.certsrv.client.SubsystemClient;
import com.netscape.certsrv.group.GroupClient;
import com.netscape.certsrv.logging.ActivityClient;
-import com.netscape.certsrv.logging.AuditClient;
import com.netscape.certsrv.selftests.SelfTestClient;
import com.netscape.certsrv.tps.authenticator.AuthenticatorClient;
import com.netscape.certsrv.tps.cert.TPSCertClient;
@@ -46,7 +45,6 @@ public class TPSClient extends SubsystemClient {
public void init() throws URISyntaxException {
addClient(new ActivityClient(client, name));
- addClient(new AuditClient(client, name));
addClient(new AuthenticatorClient(client, name));
addClient(new TPSCertClient(client, name));
addClient(new ConfigClient(client, name));
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
index 1e2273e5173a10575afd54f95b9d7eb8a07a9367..ff489dcebf274e80dc688192a5a803085ff1992c 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
@@ -27,16 +27,20 @@ import com.netscape.certsrv.client.PKIClient;
import com.netscape.certsrv.logging.AuditClient;
import com.netscape.certsrv.logging.AuditConfig;
import com.netscape.cmstools.cli.CLI;
+import com.netscape.cmstools.cli.SubsystemCLI;
/**
* @author Endi S. Dewata
*/
public class AuditCLI extends CLI {
+ public SubsystemCLI subsystemCLI;
public AuditClient auditClient;
- public AuditCLI(CLI parent) {
- super("audit", "Audit management commands", parent);
+ public AuditCLI(SubsystemCLI subsystemCLI) {
+ super("audit", "Audit management commands", subsystemCLI);
+
+ this.subsystemCLI = subsystemCLI;
addModule(new AuditModifyCLI(this));
addModule(new AuditShowCLI(this));
@@ -52,7 +56,7 @@ public class AuditCLI extends CLI {
if (auditClient != null) return auditClient;
PKIClient client = getClient();
- auditClient = (AuditClient)parent.getClient("audit");
+ auditClient = new AuditClient(client, subsystemCLI.getName());
return auditClient;
}
--
2.9.3
_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel
