|
@@ -41,7 +41,6 @@ const char * ProcessTimeQuery = "\\Processor Information(_Total)\\% Processor Ti
|
|
|
|
|
|
ErrorCodeEnum CHeartBeatFSM::OnInit()
|
|
|
{
|
|
|
- LOG_FUNCTION();
|
|
|
GetEntityBase()->GetFunction()->SetSysVar("HeartbeatState","S");
|
|
|
ErrorCodeEnum Error;
|
|
|
CSmartPointer<IEntityFunction> spEntityFunction = GetEntityBase()->GetFunction();
|
|
@@ -55,17 +54,18 @@ ErrorCodeEnum CHeartBeatFSM::OnInit()
|
|
|
|
|
|
Error = spEntityFunction->OpenConfig(Config_CenterSetting, spConfig);
|
|
|
if (Error != Error_Succeed) {
|
|
|
- LOG_TRACE("open cfg file failed!");
|
|
|
- //logwarn oiltest
|
|
|
+ LogWarn(Severity_Middle, Error_NotConfig, LOG_EVT_HEARTBEAT_LACK_CENSETTINGS, "打开集中配置失败,请检查集中配置是否存在!");
|
|
|
return Error_DevLoadFileFailed;
|
|
|
}
|
|
|
m_tmpTestFlag = 0;
|
|
|
|
|
|
m_isCardStore = !sysInfo.strMachineType.Compare("RVC.CardStore", true);
|
|
|
|
|
|
- ErrorCodeEnum rc = GetServerAddr(spConfig, m_isCardStore);
|
|
|
- if(Error_Succeed != rc)
|
|
|
- return rc;
|
|
|
+ ErrorCodeEnum rc = GetServerAddr(spConfig, m_isCardStore);
|
|
|
+ if (Error_Succeed != rc) {
|
|
|
+ LogWarn(Severity_Middle, Error_NotConfig, LOG_EVT_HEARTBEAT_LACK_CENSETTINGS, "找不到对应的配置,请检查集中配置是否存在!");
|
|
|
+ return rc;
|
|
|
+ }
|
|
|
|
|
|
spConfig->ReadConfigValueInt(GetEntityBase()->GetEntityName(),"TestFlag",m_tmpTestFlag);
|
|
|
spConfig->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "LongConnInterval", m_longConnInterval);
|
|
@@ -135,9 +135,6 @@ ErrorCodeEnum CHeartBeatFSM::OnInit()
|
|
|
LogWarn(Severity_Low, Error_Exception, LOG_EVT_HEARTBEAT_TASK_NOT_START,"NewHandShakeTask task not start,HandShakeUrl is temp,LongConnInterval use default 20s");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
return Error_Succeed;
|
|
|
}
|
|
|
ErrorCodeEnum CHeartBeatFSM::OnExit()
|