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

Z991239-6440 #comment feat: 心跳实体连接主备模式功能改造

Signed-Off-By: commit-hook
刘文涛80174520 1 сар өмнө
parent
commit
ca51cf9b1b

+ 6 - 5
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -1567,15 +1567,16 @@ void HeartBeatConnection::PkgRcvProcCardActive(const CSmartPointer<IPackage> &pR
 ErrorCodeEnum CHeartBeatFSM::ParseServerAddr(bool isCardStore)
 {
 	//地址赋值
-	m_servStrBArr.Init(1);
+	CSimpleStringA servStrBackup = "";
 	if (isCardStore){
 		m_servStr = CARDISSUER_STORE_MAIN_SERVER;
-		m_servStrBArr[0] = CARDISSUER_STORE_BACKUP_SERVER;
+		servStrBackup = CARDISSUER_STORE_BACKUP_SERVER;
 
 	}else {
 		m_servStr = CARDISSUER_STAND_MAIN_SERVER;
-		m_servStrBArr[0] = CARDISSUER_STAND_BACKUP_SERVER;
+		servStrBackup = CARDISSUER_STAND_BACKUP_SERVER;
 	}
+	m_servStrBArr = servStrBackup.Split('|');
 
 	if (m_servStr.IsNullOrEmpty()) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("实体HeartBeat配置的main_server值为空,请确认是否已设置正确,main_server=%s", m_servStr);
@@ -1590,7 +1591,7 @@ ErrorCodeEnum CHeartBeatFSM::ParseServerAddr(bool isCardStore)
 		else {
 			CSimpleStringA servIP = aaServ[0];
 			int port = atoi(aaServ[1]);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s,%d", servIP.GetData(), port);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("main server: %s,%d", servIP.GetData(), port);
 		}
 	}
 	
@@ -1607,7 +1608,7 @@ ErrorCodeEnum CHeartBeatFSM::ParseServerAddr(bool isCardStore)
 			else {
 				CSimpleStringA servIP = aaServB[0];
 				int port = atoi(aaServB[1]);
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s,%d", servIP.GetData(), port);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("backup server: %s,%d", servIP.GetData(), port);
 			}
 		}
 	}