BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-04 14:56:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Heartbeat: Try backup1 and backup2, refactor sentry reporting

Browse Source
This commit is contained in:
Lion Kortlepel
2021-08-10 12:51:20 +02:00
committed by Lion
parent c0faff5b05
commit fe6e1e6266
7 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/THeartbeatThread.cpp
View File

@@ -39,32 +39,46 @@ void THeartbeatThread::operator()() {
T = Http::POST(Application::GetBackendHostname(), Target, {}, Body, false);
if (T.substr(0, 2) != "20") {
auto SentryReportError = [&](const std::string& transaction) {
if (T.size() > std::string("YOU_SHALL_NOT_PASS").size()
&& Application::Settings.Key.size() == 36) {
auto Lock = Sentry.CreateExclusiveContext();
Sentry.SetExtra("response-body", T);
Sentry.SetExtra("request-body", Body);
Sentry.SetTransaction(transaction);
Sentry.Log(SENTRY_LEVEL_ERROR, "default", "wrong backend response format");
}
};
SentryReportError(Application::GetBackendHostname() + Target);
//Backend system refused server startup!
warn("Backend system refused server! Server might not show in the public list");
debug("server returned \"" + T + "\"");
if (T.size() > std::string("YOU_SHALL_NOT_PASS").size()
&& Application::Settings.Key.size() == 36) {
auto Lock = Sentry.CreateExclusiveContext();
Sentry.AddExtra("response-body", T);
Sentry.AddExtra("request-body", Body);
Sentry.SetTransaction(Application::GetBackendHostname() + Target);
Sentry.Log(SENTRY_LEVEL_ERROR, "default", "wrong backend response format");
}
isAuth = false;
}
if (!isAuth) {
if (T == "2000") {
info(("Authenticated!"));
isAuth = true;
} else if (T == "200") {
info(("Resumed authenticated session!"));
isAuth = true;
std::this_thread::sleep_for(std::chrono::milliseconds(500));
T = Http::POST(Application::GetBackup1Hostname(), Target, {}, Body, false);
if (T.substr(0, 2) != "20") {
SentryReportError(Application::GetBackup1Hostname() + Target);
std::this_thread::sleep_for(std::chrono::milliseconds(500));
T = Http::POST(Application::GetBackup2Hostname(), Target, {}, Body, false);
if (T.substr(0, 2) != "20") {
warn("Backend system refused server! Server might not show in the public list");
isAuth = false;
SentryReportError(Application::GetBackup2Hostname() + Target);
}
}
}
//SocketIO::Get().SetAuthenticated(isAuth);
}
if (!isAuth) {
if (T == "2000") {
info(("Authenticated!"));
isAuth = true;
} else if (T == "200") {
info(("Resumed authenticated session!"));
isAuth = true;
}
}
//SocketIO::Get().SetAuthenticated(isAuth);
}
}
std::string THeartbeatThread::GenerateCall() {
std::stringstream Ret;