Преглед на файлове

Z991239-4916 #comment 拉取失败告知Chromium

oilyang преди 1 година
родител
ревизия
012942c3f5
променени са 2 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 1 0
      Module/include/EventCode.h
  2. 4 1
      Module/mod_vtmloader/VtmLoaderFSM.cpp

+ 1 - 0
Module/include/EventCode.h

@@ -84,6 +84,7 @@ static const char* Device_Type_Table[] = {
 #define Event_VtmLoader_GetCenterSetting_Suc 	0x10f00001	//配置拉取完成
 #define Event_VtmLoader_EntityLoad_Finished 	0x10f00002	//实体加载完成
 #define Event_VtmLoader_EntityLoad_Failed 		0x10f00003	//实体加载失败
+#define Event_VtmLoader_GetCenterSetting_Fail 	0x10f00004	//配置拉取失败
 
 #ifndef _WIN32
 /*----MaintainWatcher--modify--by--LZM--at--2020/4/8----*/

+ 4 - 1
Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -894,7 +894,8 @@ int CVtmLoaderFSM::NetWorkCheckAndGetSetting()
 		}
 	}
 	//拉取配置并通知提前启动的实体(Chromium)
-	GetCenterSetting();
+	if (!GetCenterSetting())
+		return -2;
 	//加载实体列表
 	EntityLoad();
 
@@ -1354,6 +1355,7 @@ bool CVtmLoaderFSM::GetCenterSetting()
 	{
 		LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("拉取配置,初始化配置地址失败:0x%x(%s)", eErr, SpStrError(eErr)));
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F01")("Get center setting,InitCfgUrl failed.");
+		LogEvent(Severity_High, Event_VtmLoader_GetCenterSetting_Fail, "拉取配置,初始化配置地址失败");
 		return false;
 	}
 	else
@@ -1366,6 +1368,7 @@ bool CVtmLoaderFSM::GetCenterSetting()
 		{
 			LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("拉取配置失败:0x%x(%s)", eErr, SpStrError(eErr)));
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F13").setResultCode("RTA1F03")("Get center setting, TryUpdateCfg failed:0x%x", eErr);
+			LogEvent(Severity_High, Event_VtmLoader_GetCenterSetting_Fail, "拉取配置失败");
 			return false;
 		}
 	}