games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Use different delay and maximum number of connection attempts for local and remote servers

Browse Source
This commit is contained in:
Alexander Wilms 2023-09-27 17:11:19 +02:00
parent 9f9930a9dd
commit 39427d6658
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client/CServerHandler.cpp
View File

@ -251,11 +251,39 @@ void CServerHandler::startLocalServerAndConnect()
void CServerHandler::justConnectToServer(const std::string & addr, const ui16 port)
{
state = EClientState::CONNECTING;
logNetwork->info("Establishing connection...");
std::string hostAddress = getHostAddress();
ui16 hostPort = getHostPort();
logNetwork->info("Establishing connection...");
boost::chrono::duration<long, boost::ratio<1, 1000>> sleepDuration{};
int maxConnectionAttempts;
if(hostAddress == "127.0.0.1")
{
sleepDuration = boost::chrono::milliseconds(10);
maxConnectionAttempts = 100;
}
else
{
// remote server
sleepDuration = boost::chrono::seconds(2);
maxConnectionAttempts = 10;
}
logNetwork->info("\nWaiting for %d ms between each of the %d attempts to connect", sleepDuration.count(), maxConnectionAttempts);
uint connectionAttemptCount = 0;
while(!c && state != EClientState::CONNECTION_CANCELLED)
{
connectionAttemptCount++;
if(connectionAttemptCount > maxConnectionAttempts)
{
logNetwork->error("\nExceeded maximum of %d connection attempts", maxConnectionAttempts);
break;
}
try
{
c = std::make_shared<CConnection>(
@ -265,8 +293,7 @@ void CServerHandler::justConnectToServer(const std::string & addr, const ui16 po
}
catch(std::runtime_error & error)
{
logNetwork->warn("\nCannot establish connection. %s Retrying in 10 ms", error.what());
boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
boost::this_thread::sleep_for(sleepDuration);
}
}