Z991239-5585 #comment feat: 优化告警日志

Signed-Off-By: commit-hook

Module/include/EventCode.h

@@ -624,6 +624,7 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define ERR_TASK_ROLL_BACK_ACTIVE_FAIL 0X50620015 //回滚更新active文件失败
 #define ERR_TASK_INVALID_RUNINFO_TASK 0X50620016 //运行时任务无效
 #define ERR_TASK_QUERY_NO_TASK 0X50620017 //查询无任务告警
+#define ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL 0X50620018 //回退版检查失败
 
 #define WARN_TASK_START_NEW_MODE 0X50620020 //启动新模式升级告警
 #define WARN_TASK_START_OLD_MODE 0X50620021 //启动旧模式升级告警

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -4228,8 +4228,9 @@ ErrorCodeEnum CUpgradeTaskFSM::RollBackVersionCheck(string& failReason, CSimpleS
 	ErrorCodeEnum rc = m_pEntity->GetFunction()->GetPath("RootVer", rootVerPath);//获取version根路径
 	if (rc != Error_Succeed) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("RollBackVersionCheck")("RollBackVersionCheck fail , get RootVer path is fail");
-		//LogWarn(Severity_Middle, Error_Exception, ERR_TASK_UPDATE_ACTIVE_FAIL, "UpgradeToNewVersion: get RootVer path is fail");
+		LogWarn(Severity_Middle, Error_Exception, ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL, "RollBackVersionCheck: get RootVer path is fail");
 		failReason = "C";
+		strErrMsg = "RollBackVersionCheck fail , get RootVer path is fail";
 		return Error_Bug;
 	}
 
@@ -4241,8 +4242,9 @@ ErrorCodeEnum CUpgradeTaskFSM::RollBackVersionCheck(string& failReason, CSimpleS
 	if (n != 4)
 	{
 		strErrMsg = CSimpleStringA::Format("指定回退版本号无效(%s)", strRollbackVersion.GetData());
-		//LogError(Severity_Low, Error_Unexpect, 0, CSimpleStringA::Format("specified software version is invalid: [%s]", strUpgradeVersion.GetData()).GetData());
+		LogWarn(Severity_Middle, Error_Exception, ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL, CSimpleStringA::Format("specified Rollback version is invalid: [%s]", strRollbackVersion.GetData()).GetData());
 		failReason = "C";
+		strErrMsg = CSimpleStringA::Format("specified Rollback version is invalid: [%s]", strRollbackVersion.GetData());
 		return Error_Bug;
 	}
 	else {
@@ -4265,19 +4267,16 @@ ErrorCodeEnum CUpgradeTaskFSM::RollBackVersionCheck(string& failReason, CSimpleS
 		return Error_Unexpect;
 	}
 
-
-
 	//回退版本是否存在
 	CSimpleStringA strRollbackVerPath = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s", rootVerPath.GetData(), m_currentTask.NewVersion.GetData());
 	if (!ExistsDirA(strRollbackVerPath.GetData())) {
-		//LogWarn(Severity_Middle, Error_Exception, ERR_TASK_UPDATE_ACTIVE_FAIL, CSimpleStringA::Format("UpgradeToNewVersion fail, strNewVerPath =%s is not exist,fail", strNewVerPath.GetData()).GetData());
+		LogWarn(Severity_Middle, Error_Exception, ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL, CSimpleStringA::Format("RollBackVersionCheck fail, strRollbackVerPath =%s is not exist,fail", strRollbackVerPath.GetData()).GetData());
 		strErrMsg = CSimpleStringA::Format("指定回退版本文件夹不存在(配置:%s)", strRollbackVersion.GetData());
 		failReason = "X";
-		return Error_Unexpect;//这种情况有问题，需要清除此任务
+		return Error_Unexpect;
 	}
 
 	return Error_Succeed;
-
 }
 
 ErrorCodeEnum CUpgradeTaskFSM::SM3FileToStr(CSimpleStringA strFilePath, CSimpleStringA &strSM3,bool isSub)