Z991239-5627 #comment feat: 优化告警信息

Signed-Off-By: commit-hook

Module/include/EventCode.h

@@ -593,15 +593,15 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define Event_Req_Framework_Rollback 0x50600003
 //请求框架重启 事件 2 0x50600004 请求健康实体执行框架重启，非版本升级，监护不做回退监控
 #define Event_Req_Framework_No_Upgrade_Restart 0x50600004
-//请求框架重启 事件 2 0x50600005 请求健康实体执行框架重启，版本回退，监护不做回退监控
-#define Event_Req_Framework_Rollback_Restart 0x50600005
-//请求框架重启 事件 2 0x50600006 请求健康实体执行操作系统重启，版本升级，监护做回退监控
-#define Event_Req_OS_Upgrade_Restart 0x50600006
+//请求框架重启 事件 2 0x50600010 请求健康实体执行框架重启，版本回退，监护不做回退监控
+#define Event_Req_Framework_Rollback_Restart 0x50600100
+//请求框架重启 事件 2 0x50600011 请求健康实体执行操作系统重启，版本升级，监护做回退监控
+#define Event_Req_OS_Upgrade_Restart 0x50600101
 
 #define LOG_WRAN_UPGRADE_PROGRESS 0x50610000 //升级过程告警
 
 
-#define ERR_READ_INI_FAIL 0x50600004 //读实体配置文件错误
+
 #define ERR_WRAN_UPGRADE_PROGRESS 0x50600005 //升级过程获取升级信息报错
 #define ERR_WRAN_SYSPACK 0x50600006 //获取已安装体系外升级包报错
 #define ERR_WRAN_CREATE_INSTALL 0x50600010 //创建install文件报错
@@ -630,6 +630,10 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define ERR_TASK_INVALID_RUNINFO_TASK 0X50620016 //运行时任务无效
 #define ERR_TASK_QUERY_NO_TASK 0X50620017 //查询无任务告警
 #define ERR_TASK_ROLLBACK_VERSION_CHECK_FAIL 0X50620018 //回退版检查失败
+#define ERR_TASK_ROLLBACK_FAIL 0X50620019 //回滚失败
+#define ERR_TASK_STOP_MEDIA_FAIL 0X5062001A //停止媒体失败
+#define ERR_TASK_INSTALL_VERSION_FAIL 0X5062001B //安装版本失败
+#define ERR_TASK_UNZIP_PACK_FAIL 0X5062001C //解压版本失败
 
 #define WARN_TASK_START_NEW_MODE 0X50620020 //启动新模式升级告警
 #define WARN_TASK_START_OLD_MODE 0X50620021 //启动旧模式升级告警

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -73,7 +73,7 @@ namespace Task
 
 			if (rc != Error_Succeed)
 			{
-				LogWarn(Severity_Low, rc, 0, "get SM3 list fail");
+				LogWarn(Severity_Low, rc, ERR_TASK_GET_SM3_HASH_FAIL, "get SM3 list fail");
 				return false;
 			}
 			else
@@ -88,7 +88,7 @@ namespace Task
 						m_fsm->m_fileSM3ListHash = tempSM3HashStr;
 						return true;
 					}else{
-						LogWarn(Severity_Low, rc, 0, "get SM3 list hash fail");
+						LogWarn(Severity_Low, rc, ERR_TASK_GET_SM3_HASH_FAIL, "get SM3 list hash fail");
 						return false;
 					}
 				}
@@ -1661,7 +1661,7 @@ ErrorCodeEnum CUpgradeTaskFSM::CreateNewVersion(CVersion NewSoftwareVersion,CSim
 
 	if (curVersion == NewSoftwareVersion)
 	{
-		LogWarn(Severity_Low, Error_Bug, 0, CSimpleStringA::Format("new ver [%s] equals current ver [%s]", NewSoftwareVersion.ToString().GetData(), curVersion.ToString().GetData()).GetData());
+		LogWarn(Severity_Low, Error_Bug, ERR_TASK_INSTALL_VERSION_FAIL, CSimpleStringA::Format("new ver [%s] equals current ver [%s]", NewSoftwareVersion.ToString().GetData(), curVersion.ToString().GetData()).GetData());
 		strErrInfo = CSimpleStringA::Format("new ver [%s] equals current ver [%s]", NewSoftwareVersion.ToString().GetData(), curVersion.ToString().GetData());
 		return Error_Bug;
 	}
@@ -1889,7 +1889,7 @@ int CUpgradeTaskFSM::ExecInstall(CSimpleStringA &strErrMsg)
 		if (n != 4)
 		{
 			strErrMsg = CSimpleStringA::Format("指定升级版本号无效(%s)", strUpgradeVersion.GetData());
-			LogWarn(Severity_Low, Error_Unexpect, 0, CSimpleStringA::Format("specified software version is invalid: [%s]", strUpgradeVersion.GetData()).GetData());
+			LogWarn(Severity_Low, Error_Unexpect, ERR_TASK_INSTALL_VERSION_FAIL, CSimpleStringA::Format("specified software version is invalid: [%s]", strUpgradeVersion.GetData()).GetData());
 			return 0;
 		}else{
 			latterVersion = CVersion(dwMajor, dwMinor, dwRevision, dwBuild);
@@ -3358,7 +3358,7 @@ ErrorCodeEnum CUpgradeTaskFSM::UnzipPack(const char* unZipPackName)
 	CSimpleStringA strZipFile = CSimpleStringA::Format("%s\\%s", strDownloadsPath.GetData(), unZipPackName);
 	//升级包是否存在
 	if(!ExistsFileA(strZipFile)){
-		LogWarn(Severity_Low, Error_NotExist, 0,  CSimpleStringA::Format("pack [%s] not exists", unZipPackName).GetData());
+		LogWarn(Severity_Low, Error_NotExist, ERR_TASK_UNZIP_PACK_FAIL,  CSimpleStringA::Format("pack [%s] not exists", unZipPackName).GetData());
 		return  Error_NotExist;
 	}
 
@@ -3392,7 +3392,7 @@ ErrorCodeEnum CUpgradeTaskFSM::UnzipPack(const char* unZipPackName)
 	if (hz == 0)
 	{
 		SetCurrentDirectoryA(szOldPath);
-		LogWarn(Severity_Low, Error_Unexpect, 0,  CSimpleStringA::Format("open zip file [%s] fail", unZipPackName).GetData());
+		LogWarn(Severity_Low, Error_Unexpect, ERR_TASK_UNZIP_PACK_FAIL,  CSimpleStringA::Format("open zip file [%s] fail", unZipPackName).GetData());
 		return  Error_Unexpect;
 	}
 
@@ -3458,7 +3458,7 @@ ErrorCodeEnum CUpgradeTaskFSM::UnzipPack(const char* unZipPackName)
 	CSimpleStringA strZipFile = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "%s", strDownloadsPath.GetData(), unZipPackName);
 	//升级包是否存在
 	if (!ExistsFileA(strZipFile)) {
-		LogWarn(Severity_Low, Error_NotExist, 0, CSimpleStringA::Format("pack [%s] not exists", unZipPackName).GetData());
+		LogWarn(Severity_Low, Error_NotExist, ERR_TASK_UNZIP_PACK_FAIL, CSimpleStringA::Format("pack [%s] not exists", unZipPackName).GetData());
 		return  Error_NotExist;
 	}
 
@@ -3495,7 +3495,7 @@ ErrorCodeEnum CUpgradeTaskFSM::UnzipPack(const char* unZipPackName)
 
 	if (UnZipToDir(zipFileStr, zipTempDir) != 0)
 	{
-		LogWarn(Severity_Low, Error_Unexpect, 0, CSimpleStringA::Format("unzip pack [%s] fail", unZipPackName));
+		LogWarn(Severity_Low, Error_Unexpect, ERR_TASK_UNZIP_PACK_FAIL, CSimpleStringA::Format("unzip pack [%s] fail", unZipPackName));
 		return  Error_NotExist;
 	}
 	return Error_Succeed;

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -105,7 +105,7 @@ namespace Task
 					}
 					else
 					{
-						LogWarn(Severity_Low, rc, 0, "rollback upgrade fail");
+						LogWarn(Severity_Low, rc, ERR_TASK_ROLLBACK_FAIL, "rollback upgrade fail");
 					}
 					loop = false;//退出
 				}
@@ -123,7 +123,7 @@ namespace Task
 						}
 						else
 						{
-							LogWarn(Severity_Low, rc, 0, "rollback upgrade fail");
+							LogWarn(Severity_Low, rc, ERR_TASK_ROLLBACK_FAIL, "rollback upgrade fail");
 						}
 						loop = false;//退出
 					}
@@ -193,7 +193,7 @@ void CUpgradeMgrEntity::OnStarted()
 	rc = this->GetFunction()->PostThreadPoolTask(task);
 	if (rc != Error_Succeed)
 	{
-		LogWarn(Severity_Middle, rc, 0, CSimpleStringA::Format("Post InitFSMTask task to Thread is fail,%d",(int)rc).GetData());
+		LogWarn(Severity_Middle, rc, ERR_TASK_INIT_NEW_UPGRADE, CSimpleStringA::Format("Post InitFSMTask task to Thread is fail,%d",(int)rc).GetData());
 		m_testResult=Error_InvalidState;//自检失败
 	}
 }
@@ -307,7 +307,7 @@ ErrorCodeEnum CUpgradeMgrEntity::RollbackUpdate(const CSimpleStringA &strVersion
 		if(bNewUpgradeMgr){
 			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("RollbackUpdate")("RollbackUpdate new UpgradeMgr deal with");
 			if(strVersion.GetLength()==0){
-				LogWarn(Severity_Low, Error_NotImpl, 0, "version is empty , rollback upgrade fail");
+				LogWarn(Severity_Low, Error_NotImpl, ERR_TASK_ROLLBACK_FAIL, "version is empty , rollback upgrade fail");
 				return Error_NotImpl;
 			}else{
 				ErrorCodeEnum rc = Error_Succeed;
@@ -440,7 +440,7 @@ ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 	}
 	else
 	{
-		LogWarn(Severity_Low, rc, 0, "connect to entity [LocalMediaPlay] fail");
+		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
 	}
 	pClient->SafeDelete();
 	return rc;
@@ -481,7 +481,7 @@ ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 	}
 	else
 	{
-		LogWarn(Severity_Low, rc, 0, "connect to entity [LocalMediaPlay] fail");
+		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
 		pClient->SafeDelete();
 	}
 	return rc;