From e0e39df05177bc083c3b643c3703196ecd6bb787 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 20 Aug 2016 14:21:42 +0000 Subject: [PATCH] forgot something, now time to sleep --- .../src/shared/CentralServer.cpp | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index e21ce7f3..db01bf98 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -2862,46 +2862,51 @@ void CentralServer::sendPopulationUpdateToLoginServer() void CentralServer::sendMetricsToWebAPI() { - // create the object - webAPI api(std::string(ConfigCentralServer::getMetricsDataURL())); + static const std::string metricsURL(ConfigCentralServer::getMetricsDataURL()); + + if (!metricsURL.empty()) + { + // create the object + webAPI api(metricsURL); - // add our data - api.addJsonData("totalPlayerCount", m_totalPlayerCount); - api.addJsonData("totalGameServers", (m_gameServers.size() - 1)); - api.addJsonData("totalPlanetServers", m_planetServers.size()); - api.addJsonData("isPublic", getIsClusterPublic()); - api.addJsonData("isLocked", getIsClusterLocked()); - api.addJsonData("isSecret", getIsClusterSecret()); - api.addJsonData("preloadFinished", getClusterStartupTime()); - api.addJsonData("databasebacklogged", isDatabaseBacklogged()); - api.addJsonData("totalTutorialSceneCount", getClusterStartupTime()); - api.addJsonData("totalFalconSceneCount", isDatabaseBacklogged()); + // add our data + api.addJsonData("totalPlayerCount", m_totalPlayerCount); + api.addJsonData("totalGameServers", (m_gameServers.size() - 1)); + api.addJsonData("totalPlanetServers", m_planetServers.size()); + api.addJsonData("isPublic", getIsClusterPublic()); + api.addJsonData("isLocked", getIsClusterLocked()); + api.addJsonData("isSecret", getIsClusterSecret()); + api.addJsonData("preloadFinished", getClusterStartupTime()); + api.addJsonData("databasebacklogged", isDatabaseBacklogged()); + api.addJsonData("totalTutorialSceneCount", getClusterStartupTime()); + api.addJsonData("totalFalconSceneCount", isDatabaseBacklogged()); #ifdef _DEBUG - if (api.submit()) { - std::string status = api.getRespValue("status"); - - if (status.empty() || status != "success") - { - std::string message = api.getRespValue("message"); + if (api.submit()) { + std::string status = api.getRespValue("status"); - if (message.empty()) + if (status.empty() || status != "success") { - message = "No message returned."; + std::string message = api.getRespValue("message"); + + if (message.empty()) + { + message = "No message returned."; + } + + WARNING(true, ("Error sending stats: %s", message.c_str())); } - WARNING(true, ("Error sending stats: %s", message.c_str())); + WARNING(true, ("Success sending server stats to API.")); + } + else + { + WARNING(true, ("Error sending stats.")); } - - WARNING(true, ("Success sending server stats to API.")); - } - else - { - WARNING(true, ("Error sending stats.")); - } #else - api.submit(); + api.submit(); #endif + } } //-----------------------------------------------------------------------