Ver código fonte

Z991239-6368 #comment 在VtmLoader启动时,开始加载实体之前,对AuthErrMsg清空并持久化

oilyang 2 meses atrás
pai
commit
333f4d1df0
1 arquivos alterados com 10 adições e 2 exclusões
  1. 10 2
      Module/mod_vtmloader/VtmLoaderFSM.cpp

+ 10 - 2
Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1128,6 +1128,12 @@ int CVtmLoaderFSM::EntityLoad()
 	else
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("GetSystemRunInfo failed:%d");
 
+	//oilyang@20250715 before load entitys, to set sysvar "AuthErrMsg" to ""
+	//oiltmp@20250715 several months later,we can delete this
+	ErrorCodeEnum eErrCode = Error_Unexpect;
+	if ((eErrCode = GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", "",true)) != Error_Succeed)
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setResultCode(RTAERR_SYSVAR_SET_FAILED)("Set sysvar \"AuthErrMsg\" failed:%d", eErrCode);
+
 	LogWarn(Severity_Low, Error_Succeed, VtmLoader_BootInfoPrint, "开始加载实体");
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("StartLoadEntity")("开始加载实体");
 
@@ -1232,8 +1238,10 @@ int CVtmLoaderFSM::EntityLoad()
 
 	//oilyang if install VTM ,just wait for msg to start entity
 	CSimpleStringA csTermStage("");
-	ErrorCodeEnum eErrCode = GetEntityBase()->GetFunction()->GetSysVar("TerminalStage", csTermStage);
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("TerminalStage %s.", csTermStage.GetData());
+	if ((eErrCode = GetEntityBase()->GetFunction()->GetSysVar("TerminalStage", csTermStage)) != Error_Succeed)
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setResultCode(RTAERR_SYSVAR_GET_FAILED)("Get sysvar \"TerminalStage\" failed:%d", eErrCode);
+	else
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("TerminalStage %s.", csTermStage.GetData());
 	if (csTermStage.Compare("N") == 0)//"N" for installing
 	{
 		//start UpgradeManager