Z991239-3265 #comment feat:1.新增删除旧版本结果告警、2.添加删除功能至任务池中

Module/include/EventCode.h

@@ -875,6 +875,9 @@ ERR_ACCESSAUTH_SHA1_HASH}
 #define LOG_ERR_SET_DNS_FAILED		0x50A00032
 #define LOG_WARN_DELETE_DNS_CUST	0x50A00033
 #define LOG_ERR_DELETE_DNS_FAILED	0x50A00034
+
+#define LOG_WARN_VER_DELETE	0x50A00040
+
 #define LOG_WARN_NET_PROBE_FAILED_BASE	0x50A35500 //预留100个错误码50A35500-50A35599，用于网络探测监控
 #define LOG_WARN_NET_PROBE_SUCCESS_BASE	0x50A35600 //预留100个错误码50A35600-50A35699，用于网络探测监控
 

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -1748,7 +1748,7 @@ BOOL ResourceWatcherFSM::DeleteVersionPackage()
 
     //获取当前目录下的文件夹名称, 将符合命名规则的终端版本名称push_back
     CSimpleStringA csPath;
-    ErrorCodeEnum Error = m_pEntity->GetFunction()->GetPath("Root", csPath);   //获取当前版本路劲 例如：C:\Run
+    ErrorCodeEnum Error = m_pEntity->GetFunction()->GetPath("RootVer", csPath);   //获取当前版本路劲 例如：C:\Run
     if (Error_Succeed == Error) {
         if (csPath.IsNullOrEmpty())
         {
@@ -1757,7 +1757,7 @@ BOOL ResourceWatcherFSM::DeleteVersionPackage()
         }
         else
         {
-            csPath.Append("/version");
+            /*csPath.Append("/version");*/
             Dbg("CUR VERSION PATH = %s.", csPath.GetData());
         }
     }
@@ -1854,7 +1854,7 @@ BOOL ResourceWatcherFSM::DeleteVersionPackage()
         vector<CVersion>::reverse_iterator riter = intallInfoVects.rbegin();
         while (riter != intallInfoVects.rend()) {
             //Dbg("InstallPackage Info: %s, SwithOverDate: %s", (LPCTSTR)iter->InstallVersion.ToString(), (LPCTSTR)iter->tmSwithOverDate.ToTimeString());
-            Dbg("InstallPackage Info: %s", (*riter).ToString());
+            Dbg("InstallPackage Info: %s", (LPCTSTR)(*riter).ToString());
             if (++nSavedCount <= verSaved) {
                 Dbg("Save above version");
                 riter++;
@@ -1875,6 +1875,9 @@ BOOL ResourceWatcherFSM::DeleteVersionPackage()
     spConfigRun->WriteConfigValueInt("VersionClear", "LastCondi", nLstFlag);
     spConfigRun->WriteConfigValue("VersionClear", "LastTime",
                                   (LPCTSTR)CSimpleStringA::Format("0x%08X", (DWORD)CSmallDateTime::GetNow()));
+
+    string warn = "Delete Version files count : " + to_string(nDelVersionCnt);
+    LogWarn(Severity_Low, Error_Debug, LOG_WARN_VER_DELETE, CSimpleStringA::Format("%s", warn.c_str()));
     return TRUE;
 }
 

Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -614,7 +614,8 @@ void ResourceWatcherEntity::OnSysVarEvent(const char* pszKey, const char* pszVal
     {
         if (_strnicmp(pszValue, "M", strlen("M")) == 0)
         {
-            m_fsm.DeleteVersionPackage();
+            ClearVersionTask* task = new ClearVersionTask(&m_fsm);
+            GetFunction()->PostThreadPoolTask(task);
         }
     }