Browse Source

#IQRV #comment [Heartbeat] 补充心跳Lost前的告警

gifur 2 years ago
parent
commit
a4fcbdd757

+ 6 - 9
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -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()

+ 0 - 11
Module/mod_heartbeat/HeartBeatFSM.h

@@ -28,25 +28,14 @@ using namespace HeartBeat;
 #include "EventCode.h"
 #include "IHttpFunc.h"
 #include "CardIssuer_client_g.h"
-//using namespace CardIssuer;
 #include "PinPad_client_g.h"
-//using namespace PinPad;
 #include "CardReadAdapter_client_g.h"
-//using namespace CardReadAdapter;
 #include "IDCertificate_client_g.h"
-//using namespace IDCertificate;
-
 #include "ScannerSet_client_g.h"
 using namespace ScannerSet;
 
 typedef DWORD (__stdcall *LpRestorePerfRegistryFromFile)(LPCWSTR szFileName, LPCWSTR szLangId);
 
-#define LOG_EVT_HEARTBEAT_TASK_START		0x50310000		//新心跳服务启动
-#define LOG_EVT_HEARTBEAT_TASK_NOT_START	0x50310001		//新心跳服务未启动
-#define LOG_EVT_HEARTBEAT_HTTP_ERROR		0x50310002		//新心跳服务连接失败
-
-
-
 #pragma pack(1)
 // [StructName("FNTSTAT")]
 struct HandReq

+ 10 - 6
Module/mod_heartbeat/HeartBeat_UserErrorCode.h

@@ -4,12 +4,16 @@
 
 #define HeartBeat_UserErrorCode_Start 0x50300200
 
-#define HeartBeat_UserErrorCode_SendCardActive_InParam									(HeartBeat_UserErrorCode_Start + 1)	//大机发送跨机包,SendCardActive, 必要的入参
-#define HeartBeat_UserErrorCode_PkgRcvProcCardActive_InParam							(HeartBeat_UserErrorCode_Start + 2)	//卡库心跳接收后发送给大机,必要的参数
-#define HeartBeat_UserErrorCode_Connect_CardReader_Failed								(HeartBeat_UserErrorCode_Start + 3)	//卡库心跳连接卡机功能集失败
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Inparam				(HeartBeat_UserErrorCode_Start + 4)	//卡库心跳调用PreOnline
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Falied				(HeartBeat_UserErrorCode_Start + 5)	//卡库心跳调用PreOnline,返回失败
-#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_QueryCardInfoOnStore_Falied	(HeartBeat_UserErrorCode_Start + 6)	//卡库心跳调用PreOnline后再调用QueryCardInfoOnStore,返回失败
+#define HeartBeat_UserErrorCode_SendCardActive_InParam									0x50300201	//大机发送跨机包,SendCardActive, 必要的入参
+#define HeartBeat_UserErrorCode_PkgRcvProcCardActive_InParam							0x50300202	//卡库心跳接收后发送给大机,必要的参数
+#define HeartBeat_UserErrorCode_Connect_CardReader_Failed								0x50300203	//卡库心跳连接卡机功能集失败
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Inparam		0x50300204	//卡库心跳调用PreOnline
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_PreOnline_Falied				0x50300205	//卡库心跳调用PreOnline,返回失败
+#define HeartBeat_UserErrorCode_Connect_CardStore_Invoke_QueryCardInfoOnStore_Falied	0x50300206	//卡库心跳调用PreOnline后再调用QueryCardInfoOnStore,返回失败
 
+#define LOG_EVT_HEARTBEAT_TASK_START		0x50310000		//新心跳服务启动
+#define LOG_EVT_HEARTBEAT_TASK_NOT_START	0x50310001		//新心跳服务未启动
+#define LOG_EVT_HEARTBEAT_HTTP_ERROR		0x50310002		//新心跳服务连接失败
+#define LOG_EVT_HEARTBEAT_LACK_CENSETTINGS		0x50310003		//读取集中配置失败
 
 #endif