Prechádzať zdrojové kódy

#IQRV #comment [Module] 网络不通时不切备用地址

gifur 4 rokov pred
rodič
commit
96103e3f38

+ 0 - 4
Module/mod_CenterSetting/CenterSettingConn.cpp

@@ -250,13 +250,9 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
 
 		// дÈëͬ²½ÐÅÏ¢
 		inifile_write_str(strNewFile, "Main", "LastServer", strCurServer);
-		//WritePrivateProfileStringA("Main", "LastServer", strCurServer, strNewFile);
 		DWORD dwSyncTime = CSmallDateTime::GetNow();
 		sprintf_s(tmp, sizeof(tmp), "0x%X", dwSyncTime);
 
-		//WritePrivateProfileStringA("Main", "SyncTime", tmp, strNewFile);
-		//WritePrivateProfileStringA("Main", "SyncHash", pRet->FileHash, strNewFile);
-		//WritePrivateProfileStringA("Main", "SyncFile", pRet->FileName, strNewFile);
 		inifile_write_str(strNewFile, "Main", "SyncTime", tmp);
 		inifile_write_str(strNewFile, "Main", "SyncHash", pRet->FileHash);
 		inifile_write_str(strNewFile, "Main", "SyncFile", pRet->FileName);

+ 1 - 0
Module/mod_CenterSetting/ChangeLog

@@ -1,3 +1,4 @@
+* 网络不通时不切备用地址(廖桂发,2021年1月26日)
 * 处理主动下载集中配置的问题(廖桂发,2020年12月26日)
 * 2020年10月27日 合并国密版本的代码
 * 2020-7-3 调通与分行服务进行通信的功能,双活机制中用到

+ 6 - 7
Module/mod_CenterSetting/mod_centersetting.cpp

@@ -90,19 +90,18 @@ CServerSessionBase *CCenterSettingEntity::OnNewSession(const char* /*pszRemoteEn
 		 }
 	 } else {
          if (!SecureClientConnect(ConnectServerType::DEFAULT)) {
-             m_nConnectFailCount++;
-             if (m_nConnectFailCount < 20)
+             //m_nConnectFailCount++;
+             //if (m_nConnectFailCount < 20)
                  return Error_NetBroken;
 
-             // 10分钟连接不上,切换到备用地址		 
-             Dbg("connect fail more than 10 min, now use backup config");
-             if (!SecureClientConnect(ConnectServerType::BACKUP))
-                 return Error_NetBroken;
+             // 20次*5分钟连接不上,切换到备用地址		 
+             //Dbg("connect fail more than 20 times, now use backup config");
+             //if (!SecureClientConnect(ConnectServerType::BACKUP))
+             //    return Error_NetBroken;
          }
 	 }
 
 	 m_nConnectFailCount = 0;
-	 //Dbg("begin poll center setting");
 	 LOG_ASSERT(IsServerConnectedNow());
 	 auto rc = m_pConnection->BeginPollConfig();
 	 return rc;