!10251 优化健康搜狗调用日志；优化实体状态变更的日志

Merge pull request !10251 from 80174847/pinpadJS

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -1269,24 +1269,19 @@ void CHealthManagerFSM::QueryHardwareInfo(SpReqAnsContext<HealthManagerService_Q
 		req.mode = 1;
 		ec = (*pClient)(EntityResource::getLink().upgradeLink())->GetThirdPartyInstallState(req, ans, 15000);
 		if (IS_SUCCEED(ec)) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get Sogou version: %s, %d", ans.version.GetData(), ans.reserverd3);
 			DWORD dwUserCode(HealthManager_UserErrorCode_SogouInput_UsingSDK);
 			if (ans.reserverd3 == 1) {
 				dwUserCode = HealthManager_UserErrorCode_SogouInput_UsingSys;
 				ctx->Ans.reserved2 = 1;
 			}
-			LogWarn(Severity_Low, Error_Debug, dwUserCode,
-				CSimpleStringA::Format("{\"version\": %s,\"installTime\": %s}", ans.version.GetData(), ans.reserverd1.GetData()));
 		}
 		else {
-			LogWarn(Severity_Low, ec, HealthManager_UserErrorCode_SogouInput_UsingSDK,
-				CSimpleStringA::Format("ResourceWatcher::GetThirdPartyInstallState invoked failed: %s", SpStrError(ec)));
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("ResourceWatcher::GetThirdPartyInstallState invoked failed: %s", SpStrError(ec));
 		}
 		pClient->GetFunction()->CloseSession();
 	}
 	else {
-		LogWarn(Severity_Low, ec, HealthManager_UserErrorCode_SogouInput_UsingSDK,
-			CSimpleStringA::Format("Connet to ResourceWatcher failed: %s", SpStrError(ec)));
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("Connet to ResourceWatcher failed: %s", SpStrError(ec));
 		pClient->SafeDelete();
 	}
 

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -653,7 +653,7 @@ int CHealthManagerEntity::CheckGuardianIsRun(bool bStart)
 		int ret = kill(pID, 0);
 		if (0 == ret)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("guardian.exe is active, pid:%d", pID);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("guardian.exe is active, pid:%d", pID);
 			return 1;
 		}
 		else
@@ -1743,7 +1743,6 @@ bool CHealthManagerEntity::IsTestMode()
 
 void CHealthManagerEntity::OnEntityStateHook(const char* pszEntityName, const char* pszTriggerEntity, EntityStateEnum eState, EntityStateEnum eLastState)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s trigger by %s: from %s to %s", pszEntityName, pszTriggerEntity, SpStrEntityState(eLastState), SpStrEntityState(eState));
 	CSmartPointer<IEntityFunction> pFunc = GetFunction();
 	CSmartPointer<IEntityFunctionPrivilege> pFuncPrivilege = pFunc.ConvertCase<IEntityFunctionPrivilege>();
 	if (pFuncPrivilege == NULL)
@@ -1758,6 +1757,7 @@ void CHealthManagerEntity::OnEntityStateHook(const char* pszEntityName, const ch
 		{
 		case EntityState_Lost:
 		{
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("%s trigger by %s: from %s to %s", pszEntityName, pszTriggerEntity, SpStrEntityState(eLastState), SpStrEntityState(eState));
 			CSimpleStringA tmpWarnMsg = CSimpleStringA::Format("%s lost. trig entity:%s,lastState:%d", pszEntityName, pszTriggerEntity, eLastState);
 			CEntityStaticInfo esi = { 0 };
 			ErrorCodeEnum ec = GetFunction()->GetEntityStaticInfo(pszEntityName, esi);

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1468,7 +1468,10 @@ void CVtmLoaderFSM::NoticeEntityLoad(int evtCode)
 			req.entityList = m_csEntityList;
 			eErrCall = pHMClient->DoEvent(req, ans, 5000);
 			if (eErrCall == Error_Succeed)
+			{
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Notice HealthManager suc");
 				break;
+			}
 		}
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Notice HealthManager failed,eErrConn:%d,eErrCall:%d", eErrConn, eErrCall);
 		Sleep(2000);