teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Impove Lua Error handler for Windows

Browse source
This commit is contained in:
Koncord 2017-11-01 01:17:00 +08:00
parent 61db22f5ae
commit 948090676a
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw-mp/Script/LuaState.cpp
View file

@ -31,6 +31,30 @@
using namespace std; using namespace std;
#if defined(SOL_SAFE_FUNCTIONS) && defined(WIN32)
inline int errHandler(lua_State *L)
{
string msg = "An unknown error has triggered the default error handler";
auto maybetopmsg = sol::stack::check_get<sol::string_view>(L, 1);
if (maybetopmsg)
{
const sol::string_view &topmsg = maybetopmsg.value();
msg.assign(topmsg.data(), topmsg.size());
}
luaL_tramceback(L, L, msg.c_str(), 1);
auto maybetraceback = sol::stack::check_get<sol::string_view>(L, -1);
if (maybetraceback)
{
const sol::string_view &traceback = maybetraceback.value();
msg.assign(traceback.data(), traceback.size());
}
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, msg.c_str());
abort();
return 0; // Not used because the server is already terminated
}
#endif
LuaState::LuaState() LuaState::LuaState()
{ {
lua = make_shared<sol::state>(); lua = make_shared<sol::state>();
@ -83,12 +107,8 @@ LuaState::LuaState()
// Enable a special Sol error handler for Windows, because exceptions aren't caught properly // Enable a special Sol error handler for Windows, because exceptions aren't caught properly
// in main.cpp for it // in main.cpp for it
#if defined(SOL_SAFE_FUNCTIONS) && defined(WIN32) #if defined(SOL_SAFE_FUNCTIONS) && defined(WIN32)
lua->set_function("ErrorHandler", [](sol::object error_msg) { lua_CFunction f = sol::c_call<decltype(&errHandler), &errHandler>;
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, ("Lua: " + error_msg.as<string>()).c_str()); sol::protected_function::set_default_handler(sol::object(lua->lua_state(), sol::in_place, f));
});
sol::reference errHandler = (*lua)["ErrorHandler"];
sol::protected_function::set_default_handler(errHandler);
#endif #endif
sol::table Constants = lua->create_named_table("Constants"); sol::table Constants = lua->create_named_table("Constants");