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

add stacktrace to the server lua engine (WIP)

Browse Source
This commit is contained in:
SaltySnail 2024-07-14 00:22:48 +02:00
parent 72022e3349
commit 5502c74229
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/TLuaEngine.cpp
View File

@ -498,6 +498,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
Result->Error = false; Result->Error = false;
Result->Result = LuaResult; Result->Result = LuaResult;
} else { } else {
beammp_debug("Some call failed 2");
Result->Error = true; Result->Error = true;
Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid"; Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
} }
@ -786,6 +787,12 @@ sol::table TLuaEngine::StateThreadData::Lua_JsonDecode(const std::string& str) {
return table; return table;
} }
static std::string traceback(lua_State *L) {
auto globals = sol::state_view(L).globals();
auto test = globals.get<sol::table>("debug").get<sol::protected_function>("traceback");
return test();
}
TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine) TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine)
: mName(Name) : mName(Name)
, mStateId(StateId) , mStateId(StateId)
@ -796,6 +803,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
return; return;
} }
luaL_openlibs(mState); luaL_openlibs(mState);
// lua_pushcfunction(mState, (lua_CFunction)(traceback));
sol::state_view StateView(mState); sol::state_view StateView(mState);
lua_atpanic(mState, LuaAPI::PanicHandler); lua_atpanic(mState, LuaAPI::PanicHandler);
// StateView.globals()["package"].get() // StateView.globals()["package"].get()
@ -1090,6 +1098,8 @@ void TLuaEngine::StateThreadData::operator()() {
S.second->Error = false; S.second->Error = false;
S.second->Result = std::move(Res); S.second->Result = std::move(Res);
} else { } else {
beammp_debug("Some call failed");
traceback(StateView.lua_state());
S.second->Error = true; S.second->Error = true;
sol::error Err = Res; sol::error Err = Res;
S.second->ErrorMessage = Err.what(); S.second->ErrorMessage = Err.what();
@ -1113,7 +1123,7 @@ void TLuaEngine::StateThreadData::operator()() {
// TODO: Use TheQueuedFunction.EventName for errors, warnings, etc // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
Result->StateId = mStateId; Result->StateId = mStateId;
sol::state_view StateView(mState); sol::state_view StateView(mState);
auto Fn = StateView[FnName]; sol::protected_function Fn = StateView[FnName];
if (Fn.valid() && Fn.get_type() == sol::type::function) { if (Fn.valid() && Fn.get_type() == sol::type::function) {
std::vector<sol::object> LuaArgs; std::vector<sol::object> LuaArgs;
for (const auto& Arg : Args) { for (const auto& Arg : Args) {
@ -1149,17 +1159,21 @@ void TLuaEngine::StateThreadData::operator()() {
break; break;
} }
} }
Fn.set_error_handler([](const std::string& error, sol::this_state state) -> std::string { return traceback(state.lua_state()); });
auto Res = Fn(sol::as_args(LuaArgs)); auto Res = Fn(sol::as_args(LuaArgs));
if (Res.valid()) { if (Res.valid()) {
Result->Error = false; Result->Error = false;
Result->Result = std::move(Res); Result->Result = std::move(Res);
} else { } else {
beammp_debug("Some call failed 3");
Result->Error = true; Result->Error = true;
sol::error Err = Res; sol::error Err = Res;
Result->ErrorMessage = Err.what(); Result->ErrorMessage = Err.what();
// beammp_lua_error(traceback(StateView.lua_state()));
} }
Result->MarkAsReady(); Result->MarkAsReady();
} else { } else {
beammp_debug("Some call failed 4");
Result->Error = true; Result->Error = true;
Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
Result->MarkAsReady(); Result->MarkAsReady();