Move status marker from CS.cfg to a variable.

dogtagpki · Sep 3, 2013 · 265f790 · 265f790
1 parent 0beaa10
commit 265f790
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git 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 static ISecurityDomainSessionTable getSecurityDomainSessionTable() {
         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
@@ -1133,4 +1133,6 @@ public IResender getResender(IAuthority authority, String nickname,
     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
@@ -66,7 +66,7 @@ protected void process(CMSRequest cmsReq) throws EBaseException {
 
         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
@@ -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 void init(ISubsystem owner, IConfigStore config)
         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 void init(ISubsystem owner, IConfigStore config)
             mSDTimer.schedule(timertask, 5, (new Long(secdomain_check_interval)).longValue());
         }
 
-        mConfig.putString("cs.status", "running");
-        mConfig.commit(false);
+        serverStatus = "running";
     }
 
     /**
@@ -1929,6 +1928,11 @@ private void log(int level, String msg) {
         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
@@ -551,87 +551,73 @@ public String getConfigSDSessionId() {
 
     @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;
     }
 }