swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-02 03:16:11 -04:00
Code Issues Projects Releases Wiki Activity

move the web api updates into their own function, and make it a configurable via webUpdateIntervalSeconds, also fix the check using mod operator for shutdown as it fired every frame except frame 5, instead of every second

Browse Source
This commit is contained in:
DarthArgus
2016-05-06 02:53:37 +00:00
parent 5a082e5f1d
commit eb8e50c568
4 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CentralServer/src/shared/CentralServer.cpp
+27 -12
View File
@@ -2780,6 +2780,17 @@ void CentralServer::update()
sendPopulationUpdateToLoginServer();
}
// update the webAPI if specified
// in theory the variables should be set unless this fires at a really early frame
int webUpdateIntervalSeconds = ConfigCentralServer::getWebUpdateIntervalSeconds();
// assuming that every 5th frame is ~1 second, we can multiply and then mod
if ( webUpdateIntervalSeconds > 0 && (loopCount%(webUpdateIntervalSeconds*5) == 0))
{
sendMetricsToWebAPI();
}
if ( ConfigCentralServer::getAuctionEnabled() ) // allow auctions?
{
if ( m_pAuctionTransferClient == nullptr )
@@ -2804,7 +2815,8 @@ void CentralServer::update()
}
// check every 5th frame (one second roughly?)
if( loopCount%5 )
// mod returns 0 if no remainder - meaning the below would return true without == 0, wtf?
if( loopCount % 5 == 0 )
{
checkShutdownProcess();
}
@@ -2841,21 +2853,24 @@ void CentralServer::sendPopulationUpdateToLoginServer()
if (!isPreloadFinished() || (time(0)-m_lastLoadingStateTime < static_cast<time_t>(ConfigCentralServer::getRecentLoadingStateSeconds())))
loadedRecently=true;
// stella: Adding those for sending regular updates through WebAPI to the webserver
std::string updateURL = std::string(ConfigCentralServer::getMetricsDataURL());
if (!(updateURL.empty()))
{
std::ostringstream postBuf;
postBuf << "totalPlayerCount=" << m_totalPlayerCount << "&totalGameServers=" << m_gameServers.size() - 1 << "&totalPlanetServers=" << m_planetServers.size() << "&isPublic=" << getIsClusterPublic() << "&isLocked=" << getIsClusterLocked() << "&isSecret=" << getIsClusterSecret() << "&preloadFinished=" << getClusterStartupTime() << "&databasebacklogged=" << isDatabaseBacklogged() << "&totalTutorialSceneCount=" << m_totalTutorialSceneCount << "&totalFalconSceneCount=" << m_totalFalconSceneCount;
webAPI::simplePost(updateURL, std::string(postBuf.str()), "");
}
UpdatePlayerCountMessage upm(loadedRecently, m_totalPlayerCount, m_totalFreeTrialCount, m_totalEmptySceneCount, m_totalTutorialSceneCount, m_totalFalconSceneCount);
sendToAllLoginServers(upm);
}
void CentralServer::sendMetricsToWebAPI()
{
std::string updateURL = std::string(ConfigCentralServer::getMetricsDataURL());
if (!(updateURL.empty()))
{
std::ostringstream postBuf;
postBuf << "totalPlayerCount=" << m_totalPlayerCount << "&totalGameServers=" << m_gameServers.size() - 1 << "&totalPlanetServers=" << m_planetServers.size() << "&isPublic=" << getIsClusterPublic() << "&isLocked=" << getIsClusterLocked() << "&isSecret=" << getIsClusterSecret() << "&preloadFinished=" << getClusterStartupTime() << "&databasebacklogged=" << isDatabaseBacklogged() << "&totalTutorialSceneCount=" << m_totalTutorialSceneCount << "&totalFalconSceneCount=" << m_totalFalconSceneCount;
webAPI::simplePost(updateURL, std::string(postBuf.str()), "");
}
}
//-----------------------------------------------------------------------
void CentralServer::sendTaskMessage(const GameNetworkMessage & source)