Эх сурвалжийг харах

Z991239-4875 #comment feat: 延迟弹窗,保证其他实体已启动。这样前端能正常调用接口。

陈纪林80310970 2 жил өмнө
parent
commit
bc0f544cda

+ 2 - 0
Module/mod_CenterSetting/mod_centersetting.cpp

@@ -175,6 +175,7 @@ ErrorCodeEnum CCenterSettingEntity::GetAccessUrl(CSimpleStringA& url) //初始
 
 ErrorCodeEnum CCenterSettingEntity::GetCertainAceessUrl(CSimpleStringA& accessName, CSimpleStringA& url) //准入地址
 {
+	LOG_FUNCTION();
 	CSimpleStringA tUrl;
 	m_pCenterConfig->ReadConfigValue("AccessAuthorization", accessName.GetData(), tUrl);
 	if (tUrl.IsNullOrEmpty())
@@ -182,6 +183,7 @@ ErrorCodeEnum CCenterSettingEntity::GetCertainAceessUrl(CSimpleStringA& accessNa
 	else
 		url = tUrl;
 
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("准入地址 = %s", url.GetData());
 	return Error_Succeed;
 }
 

+ 2 - 2
Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -2319,10 +2319,10 @@ void CHealthManagerFSM::ShowEntityBootFailedAtFront(LPCTSTR lpcszEntityName, Err
 	ErrorCodeEnum errCode = GetEntityBase()->GetFunction()->GetEntityLastError(lpcszEntityName, errInfo);
 	CSimpleStringA strErrMsg(true);
 	if (!errInfo.strErrMsg.IsNullOrEmpty()) {
-		strErrMsg = CSimpleStringA::Format("%s 模块初始化失败:%s", lpcszEntityName, (LPCTSTR)errInfo.strErrMsg);
+		strErrMsg = CSimpleStringA::Format("%s:%s", lpcszEntityName, (LPCTSTR)errInfo.strErrMsg);
 	}
 	else {
-		strErrMsg = CSimpleStringA::Format("%s 模块初始化失败:%s", lpcszEntityName, (LPCTSTR)SpStrError(bootFailedResult));
+		strErrMsg = CSimpleStringA::Format("%s模块初始化失败: %s", lpcszEntityName, (LPCTSTR)SpStrError(bootFailedResult));
 	}
 	
 	if (CSimpleStringA(lpcszEntityName).Compare("SIPPhone", true) == 0)

+ 4 - 0
Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1816,8 +1816,11 @@ CSimpleStringA CHealthManagerEntity::__ReadCenterConfigStr(CSimpleStringA key, C
 
 void CHealthManagerEntity::GetAuthErrMsg(SpReqAnsContext<HealthManagerService_GetAuthErrMsg_Req, HealthManagerService_GetAuthErrMsg_Ans>::Pointer ctx)
 {
+	LOG_FUNCTION();
 	CSimpleStringA tmp;
 	GetFunction()->GetSysVar("AuthErrMsg", tmp);//获取错误页信息
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetAuthErrMsg msg = %s", tmp.GetData());
+
 	ctx->Ans.errMsg = tmp;
 
 	ctx->Answer(Error_Succeed);
@@ -2006,6 +2009,7 @@ void CHealthManagerEntity::OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nL
 	}
 	break;
 	case ERR_ACCESSAUTH_SERVICE_FAILED: //准入服务返回失败
+		Sleep(5000);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unkown access failed.no retry, no restart.");
 		m_bNeedAuthRetry = false;
 		m_bNeedGuardianRestart = false; //服务端准入失败无需重启