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

Possible fix for event handler timeouts

Browse Source
This commit is contained in:
Lion Kortlepel 2021-11-29 02:56:41 +01:00
parent ccdc5dae17
commit 98c7fea139
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/TConsole.cpp
View File

@ -149,8 +149,7 @@ void TConsole::Command_Help(const std::string&) {
kick <name> [reason] kicks specified player with an optional reason
list lists all players and info about them
say <message> sends the message to all players in chat
lua [state id] switches to lua, optionally into a specific state id's lua
)";
lua [state id] switches to lua, optionally into a specific state id's lua)";
Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
}

7
src/TLuaEngine.cpp
View File

@ -61,8 +61,11 @@ void TLuaEngine::operator()() {
while (!Res->Ready) {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
Waited++;
if (Waited > 1000) {
beammp_lua_error(Res->Function + " in " + Res->StateId + " took >1s to respond, not printing possible errors");
if (Waited > 250) {
// FIXME: This should *eventually* timeout.
// beammp_lua_error(Res->Function + " in " + Res->StateId + " took >1s to respond, not printing possible errors");
std::unique_lock Lock(mResultsToCheckMutex);
mResultsToCheck.push(Res);
break;
}
}