diff options
author | Ade Lee <alee@redhat.com> | 2013-08-29 11:28:16 -0400 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2013-09-02 22:15:24 -0400 |
commit | 05ff18eea93c9dcb926f74c57d9ad660e8cae038 (patch) | |
tree | f5d318df3b0da2881b8932ce3b40f7ba30487176 /base | |
parent | 9d70b938b921b40d2592bd7e3fafdc0e914c0a32 (diff) | |
download | pki-05ff18eea93c9dcb926f74c57d9ad660e8cae038.tar.gz pki-05ff18eea93c9dcb926f74c57d9ad660e8cae038.tar.xz pki-05ff18eea93c9dcb926f74c57d9ad660e8cae038.zip |
Move status marker from CS.cfg to a variable.
Diffstat (limited to 'base')
5 files changed, 20 insertions, 24 deletions
diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java index 00d2e0653..27cddadb8 100644 --- a/base/common/src/com/netscape/certsrv/apps/CMS.java +++ b/base/common/src/com/netscape/certsrv/apps/CMS.java @@ -1637,6 +1637,10 @@ public final class CMS { return _engine.getSecurityDomainSessionTable(); } + public static String getServerStatus() { + return _engine.getServerStatus(); + } + /** * Main driver to start CMS. */ diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java index f11005c07..74fa09003 100644 --- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java +++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java @@ -1133,4 +1133,6 @@ public interface ICMSEngine extends ISubsystem { public void setConfigSDSessionId(String id); public String getConfigSDSessionId(); + + public String getServerStatus(); } diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index dee3c1930..1d2d0e61f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -66,7 +66,7 @@ public class GetStatus extends CMSServlet { String state = config.getString("cs.state", ""); String type = config.getString("cs.type", ""); - String status = config.getString("cs.status", "unknown"); + String status = CMS.getServerStatus(); String version = GetStatus.class.getPackage().getImplementationVersion(); try { diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index a3172f51a..ff44c6dea 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -203,6 +203,7 @@ public class CMSEngine implements ICMSEngine { private String mConfigSDSessionId = null; private Timer mSDTimer = null; private String mServerCertNickname = null; + private String serverStatus = null; // static subsystems - must be singletons private static SubsystemInfo[] mStaticSubsystems = { @@ -343,8 +344,7 @@ public class CMSEngine implements ICMSEngine { mConfig = config; int state = mConfig.getInteger("cs.state"); - mConfig.putString("cs.status", "starting"); - mConfig.commit(false); + serverStatus = "starting"; // my default is 1 day String flush_timeout = config.getString("securitydomain.flushinterval", "86400000"); @@ -419,8 +419,7 @@ public class CMSEngine implements ICMSEngine { mSDTimer.schedule(timertask, 5, (new Long(secdomain_check_interval)).longValue()); } - mConfig.putString("cs.status", "running"); - mConfig.commit(false); + serverStatus = "running"; } /** @@ -1929,6 +1928,11 @@ public class CMSEngine implements ICMSEngine { Logger.getLogger().log(ILogger.EV_SYSTEM, null, ILogger.S_AUTHENTICATION, level, msg); } + + @Override + public String getServerStatus() { + return serverStatus; + } } class WarningListener implements ILogEventListener { diff --git a/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java index ce5570667..dbd27c914 100644 --- a/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java +++ b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java @@ -551,87 +551,73 @@ public class CMSEngineDefaultStub implements ICMSEngine { @Override public String getEEClientAuthSSLPort() { - // TODO Auto-generated method stub return null; } @Override public boolean verifySystemCerts() { - // TODO Auto-generated method stub return false; } @Override public boolean verifySystemCertByTag(String tag) { - // TODO Auto-generated method stub return false; } @Override public boolean verifySystemCertByNickname(String nickname, String certificateUsage) { - // TODO Auto-generated method stub return false; } @Override public CertificateUsage getCertificateUsage(String certusage) { - // TODO Auto-generated method stub return null; } @Override public void getGeneralNameConfigDefaultParams(String name, boolean isValueConfigured, Vector<String> params) { - // TODO Auto-generated method stub - } @Override public void getGeneralNamesConfigDefaultParams(String name, boolean isValueConfigured, Vector<String> params) { - // TODO Auto-generated method stub - } @Override public void getGeneralNameConfigExtendedPluginInfo(String name, boolean isValueConfigured, Vector<String> info) { - // TODO Auto-generated method stub - } @Override public void getGeneralNamesConfigExtendedPluginInfo(String name, boolean isValueConfigured, Vector<String> info) { - // TODO Auto-generated method stub - } @Override public void getSubjAltNameConfigDefaultParams(String name, Vector<String> params) { - // TODO Auto-generated method stub - } @Override public void getSubjAltNameConfigExtendedPluginInfo(String name, Vector<String> params) { - // TODO Auto-generated method stub - } @Override public IArgBlock createArgBlock(String realm, Hashtable<String, String> httpReq) { - // TODO Auto-generated method stub return null; } @Override public IArgBlock createArgBlock(Hashtable<String, String> httpReq) { - // TODO Auto-generated method stub + return null; + } + + @Override + public String getServerStatus() { return null; } } |