Browse Source

HPCC-12099 Add 4 componentTypes for ESP logging service

The changes in this fix allow a user to select the following
items from a dropdown list inside the ConfigManager:
1. EspProcess, 2. mysqlloggingagent, 3 esploggingagent,
4. loggingmanager.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 11 years ago
parent
commit
5fa11c7993
1 changed files with 49 additions and 0 deletions
  1. 49 0
      deployment/deployutils/deployutils.cpp

+ 49 - 0
deployment/deployutils/deployutils.cpp

@@ -867,6 +867,35 @@ public:
               extraInfo = strBuf.str();
               //ret->m_bAddEmpty = true;
             }
+            else if (strcmp(type, "espprocessType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/EspProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+              //ret->m_bAddEmpty = true;
+            }
+            else if (strcmp(type, "mysqlloggingagentType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/MySQLLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
+            else if (strcmp(type, "esploggingagentType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/ESPLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
+            else if (strcmp(type, "loggingmanagerType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/LoggingManager", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
             else if (strcmp(type, "ldapServerType")==0)
             {
               nCtrlType = 4;//LVC_COMBO;
@@ -1630,6 +1659,26 @@ public:
           tempPath.clear().append("./Software/MySQLProcess[1]/@name");
           wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
         }
+        else if(!strcmp(type,"espprocessType"))
+        {
+          tempPath.clear().append("./Software/EspProcess[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"mysqlloggingagentType"))
+        {
+          tempPath.clear().append("./Software/MySQLLoggingAgent[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"esploggingagentType"))
+        {
+          tempPath.clear().append("./Software/ESPLoggingAgent[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"loggingmanagerType"))
+        {
+          tempPath.clear().append("./Software/LoggingManager[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
         else if(!strcmp(type,"daliServersType"))
         {
           tempPath.clear().append("./Software/DaliServerProcess[1]/@name");