edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8103 from Robyt3/Serverbrowser-Http-Logging

Browse source 
Comment out verbose serverbrowser HTTP log message, fix typo in serverbrowser HTTP log context
This commit is contained in:
heinrich5991 2024-03-16 20:11:59 +00:00 committed by GitHub
parent 67cbac8b7c 722b5f8d11
commit 8faba8ee40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/client/serverbrowser_http.cpp
View file

@ -225,7 +225,7 @@ void CChooseMaster::CJob::Run()
pHead->Wait(); pHead->Wait();
if(pHead->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED) if(pHead->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED)
{ {
log_debug("serverbrowse_http", "master chooser aborted"); log_debug("serverbrowser_http", "master chooser aborted");
return; return;
} }
if(pHead->State() != EHttpState::DONE) if(pHead->State() != EHttpState::DONE)
@ -248,7 +248,7 @@ void CChooseMaster::CJob::Run()
auto Time = std::chrono::duration_cast<std::chrono::milliseconds>(time_get_nanoseconds() - StartTime); auto Time = std::chrono::duration_cast<std::chrono::milliseconds>(time_get_nanoseconds() - StartTime);
if(pGet->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED) if(pGet->State() == EHttpState::ABORTED || State() == IJob::STATE_ABORTED)
{ {
log_debug("serverbrowse_http", "master chooser aborted"); log_debug("serverbrowser_http", "master chooser aborted");
return; return;
} }
if(pGet->State() != EHttpState::DONE) if(pGet->State() != EHttpState::DONE)
@ -268,7 +268,7 @@ void CChooseMaster::CJob::Run()
continue; continue;
} }
int AgeS = SanitizeAge(pGet->ResultAgeSeconds()); int AgeS = SanitizeAge(pGet->ResultAgeSeconds());
log_info("serverbrowse_http", "found master, url='%s' time=%dms age=%ds", pUrl, (int)Time.count(), AgeS); log_info("serverbrowser_http", "found master, url='%s' time=%dms age=%ds", pUrl, (int)Time.count(), AgeS);
aTimeMs[i] = Time.count(); aTimeMs[i] = Time.count();
aAgeS[i] = AgeS; aAgeS[i] = AgeS;
@ -293,11 +293,11 @@ void CChooseMaster::CJob::Run()
} }
if(BestIndex == -1) if(BestIndex == -1)
{ {
log_error("serverbrowse_http", "WARNING: no usable masters found"); log_error("serverbrowser_http", "WARNING: no usable masters found");
return; return;
} }
log_info("serverbrowse_http", "determined best master, url='%s' time=%dms age=%ds", m_pData->m_aaUrls[BestIndex], BestTime, BestAge); log_info("serverbrowser_http", "determined best master, url='%s' time=%dms age=%ds", m_pData->m_aaUrls[BestIndex], BestTime, BestAge);
m_pData->m_BestIndex.store(BestIndex); m_pData->m_BestIndex.store(BestIndex);
} }
@ -374,7 +374,7 @@ void CServerBrowserHttp::Update()
{ {
if(!m_pChooseMaster->IsRefreshing()) if(!m_pChooseMaster->IsRefreshing())
{ {
log_error("serverbrowse_http", "no working serverlist URL found"); log_error("serverbrowser_http", "no working serverlist URL found");
m_State = STATE_NO_MASTER; m_State = STATE_NO_MASTER;
} }
return; return;
@ -403,7 +403,7 @@ void CServerBrowserHttp::Update()
int Age = SanitizeAge(pGetServers->ResultAgeSeconds()); int Age = SanitizeAge(pGetServers->ResultAgeSeconds());
if(!Success) if(!Success)
{ {
log_error("serverbrowse_http", "failed getting serverlist, trying to find best URL"); log_error("serverbrowser_http", "failed getting serverlist, trying to find best URL");
m_pChooseMaster->Reset(); m_pChooseMaster->Reset();
m_pChooseMaster->Refresh(); m_pChooseMaster->Refresh();
} }
@ -411,7 +411,7 @@ void CServerBrowserHttp::Update()
// that are 5 minutes old. // that are 5 minutes old.
else if(Age > 300) else if(Age > 300)
{ {
log_info("serverbrowse_http", "got stale serverlist, age=%ds, trying to find best URL", Age); log_info("serverbrowser_http", "got stale serverlist, age=%ds, trying to find best URL", Age);
m_pChooseMaster->Refresh(); m_pChooseMaster->Refresh();
} }
} }
@ -491,7 +491,7 @@ bool CServerBrowserHttp::Parse(json_value *pJson, std::vector<CServerInfo> *pvSe
NETADDR ParsedAddr; NETADDR ParsedAddr;
if(ServerbrowserParseUrl(&ParsedAddr, Addresses[a])) if(ServerbrowserParseUrl(&ParsedAddr, Addresses[a]))
{ {
log_debug("dbg/serverbrowser", "unknown address, i=%d a=%d", i, a); // log_debug("serverbrowser_http", "unknown address, i=%d a=%d", i, a);
// Skip unknown addresses. // Skip unknown addresses.
continue; continue;
} }