Z991239-5153 #comment 优化启动器加载细化记录

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -159,6 +159,7 @@ bool CVtmLoaderFSM::refreshToken()
 	if (Error_Succeed != (eErr = GetEntityBase()->GetFunction()->GetPrivilegeFunction()->TryUpdateToken(oldToken, newToken)))
 	{
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F02")("Get center setting, TryUpdateToken failed:0x%x", eErr);
+		LogWarn(Severity_High, Error_Unexpect, VtmLoader_GetConfig_UpdateToken_Failed, CSimpleStringA::Format("拉取配置失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
 		return false;
 	}
 	return true;
@@ -801,7 +802,7 @@ unsigned int CVtmLoaderFSM::s4_on_event(FSMEvent* pEvt)
 void CVtmLoaderFSM::s5_on_entry()
 {
 	LOG_FUNCTION();
-	LogWarn(Severity_High, Error_Unexpect, VtmLoader_EntityLoad_Failed, "实体加载失败，启动终止。请排查启动失败实体或重启应用");
+	
 	NoticeEntityLoadTask* pTask = new NoticeEntityLoadTask(this, Event_VtmLoader_EntityLoad_Failed);
 	GetEntityBase()->GetFunction()->PostThreadPoolTask(pTask);
 	CSmartPointer<IConfigInfo> spConfigCen, spConfigRun;
@@ -922,7 +923,7 @@ int CVtmLoaderFSM::NetWorkCheckAndGetSetting()
 		{
 			if (!DetectNetworkLegality(strMsg)) {
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F10").setResultCode("RTA1F00")("can't find valid network interface");
-				LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("%s。%d 秒后自动重试(第%d次重试)。请检查网线是否插好、网络是否正常"
+				LogWarn(Severity_High, Error_Unexpect, VtmLoader_UserCode_NetCard_UnAvaible, CSimpleStringA::Format("%s。%d 秒后自动重试(第%d次重试)。请检查网线是否插好、网络是否正常"
 					, strMsg.GetData(), m_iDetectInterval / 1000, netcheckCount).GetData());
 				//if (tmpTS.Compare("E") != 0)
 				//{
@@ -1002,17 +1003,16 @@ int CVtmLoaderFSM::EntityLoad()
 	if (csCoreBootList.IsNullOrEmpty() || csCoreBootList.IndexOf("HealthManager") < 0 || csCoreBootList.IndexOf("AccessAuthorization") < 0
 		|| csCoreBootList.IndexOf("UpgradeManager") < 0 || csCoreBootList.IndexOf("HeartBeat") < 0
 		|| csCoreBootList.IndexOf("TokenKeeper") < 0 || csCoreBootList.IndexOf("ResourceWatcher") < 0
-		|| csCoreBootList.IndexOf("EventConverter") < 0 || csCoreBootList.IndexOf("Alarm") < 0
-		|| csCoreBootList.IndexOf("CenterSetting") < 0 || csCoreBootList.IndexOf("DeviceControl") < 0)
+		|| csCoreBootList.IndexOf("EventConverter") < 0 || csCoreBootList.IndexOf("Alarm") < 0)
 	{
 		if (csCoreBootList.IsNullOrEmpty())
 		{
-			LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, "CoreBoot配置为空，请联系总行开发人员检查");
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, "CoreBoot配置为空，请联系总行开发人员检查");
 			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")("CoreBoot配置为空，请联系总行开发人员检查");
 		}
 		else
 		{
-			LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("CoreBoot配置异常，请联系总行开发人员检查(%s)", csCoreBootList.GetData()).GetData());
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_CoreBootCfg_Err, CSimpleStringA::Format("CoreBoot配置异常，请联系总行开发人员检查(%s)", csCoreBootList.GetData()).GetData());
 			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setLogCode("QLR040210F14").setResultCode("RTA1F05")(CSimpleStringA::Format("CoreBoot配置异常，请联系总行开发人员检查(%s)", csCoreBootList.GetData()));
 		}
 		//if have PinPad module
@@ -1211,6 +1211,7 @@ int CVtmLoaderFSM::CheckLoadResult(LoadStage eStage)
 			else if (it->second.eResult != LOADING_SUCCEED)
 			{
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(csLogCode).setResultCode("RTA1F04")("%s start failed", m_csErrEntity);
+				LogWarn(Severity_High, Error_Unexpect, VtmLoader_EntityLoad_Failed, CSimpleStringA::Format("实体%s加载失败，启动终止。请排查启动失败实体或重启应用", m_csErrEntity.GetData()));
 				m_csErrEntity = m_csErrEntity + "|" + it->first;
 				ret = 2;
 			}
@@ -1564,7 +1565,7 @@ bool CVtmLoaderFSM::GetConfig()
 	VTMInitParam vtmInitParam(m_terminalNoFromWeb.GetData(), channelId, tokenSecret, CommonLaunchUrl, CenterConfigTotal);
 	if (Error_Succeed != (eErr = GetEntityBase()->GetFunction()->GetPrivilegeFunction()->InitCfgUrl(vtmInitParam)))
 	{
-		LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("拉取配置,初始化配置地址失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
+		LogWarn(Severity_High, Error_Unexpect, VtmLoader_GetConfig_InitCfgUrl_Failed, CSimpleStringA::Format("拉取配置,初始化配置地址失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F01")("Get config,InitCfgUrl failed.");
 		LogEvent(Severity_High, Event_VtmLoader_GetConfig_Fail, "拉取配置,初始化配置地址失败");
 		return false;
@@ -1573,11 +1574,14 @@ bool CVtmLoaderFSM::GetConfig()
 	{
 		CSimpleString oldToken, newToken;
 		if (Error_Succeed != (eErr = GetEntityBase()->GetFunction()->GetPrivilegeFunction()->TryUpdateToken(oldToken, newToken)))
+		{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F02")("Get config, TryUpdateToken failed:0x%x", eErr);
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_GetConfig_UpdateToken_Failed, CSimpleStringA::Format("拉取配置失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
+		}
 		//if token update failed,we can also update cfg suc
 		if (Error_Succeed != (eErr = GetEntityBase()->GetFunction()->GetPrivilegeFunction()->TryUpdateCfg()))
 		{
-			LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("拉取配置失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
+			LogWarn(Severity_High, Error_Unexpect, VtmLoader_GetConfig_UpdateCfg_Failed, CSimpleStringA::Format("拉取配置失败:0x%x(%s)", eErr, SpStrError(eErr)).GetData());
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F03")("Get config, TryUpdateCfg failed:0x%x", eErr);
 			LogEvent(Severity_High, Event_VtmLoader_GetConfig_Fail, "拉取配置失败");
 			return false;

Module/mod_vtmloader/VtmLoader_UserCode.h

@@ -16,3 +16,7 @@ const int VtmLoader_EntityLoad_Failed = 0x10f0020f;
 const int VtmLoader_ConnectDetect_Failed = 0x10f00210;
 const int VtmLoader_ConnectDetect_Slow = 0x10f00211;
 const int VtmLoader_DETECT_VERSION_ERR = 0x10f00212;
+const int VtmLoader_GetConfig_InitCfgUrl_Failed = 0x10f00213;
+const int VtmLoader_GetConfig_UpdateToken_Failed = 0x10f00214;
+const int VtmLoader_GetConfig_UpdateCfg_Failed = 0x10f00215;
+const int VtmLoader_CoreBootCfg_Err = 0x10f00216;