Added lua tracebacks to some errors where you have been blind to what… (#5043)
* Added lua tracebacks to some errors where you have been blind to what actually went wrong
This commit is contained in:
parent
e12019cfd9
commit
f5070b4454
|
@ -564,7 +564,7 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
|
||||||
m_server->getScriptIface()->environment_OnGenerated(
|
m_server->getScriptIface()->environment_OnGenerated(
|
||||||
minp, maxp, m_mapgen->blockseed);
|
minp, maxp, m_mapgen->blockseed);
|
||||||
} catch (LuaError &e) {
|
} catch (LuaError &e) {
|
||||||
m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
|
m_server->setAsyncFatalError("Lua: finishGen" + std::string(e.what()));
|
||||||
}
|
}
|
||||||
|
|
||||||
EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
|
EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
|
||||||
|
|
|
@ -26,15 +26,17 @@ extern "C" {
|
||||||
#include "util/serialize.h"
|
#include "util/serialize.h"
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
|
#include "common/c_internal.h"
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
|
|
||||||
|
|
||||||
#define CHECK_TYPE(index, name, type) do { \
|
#define CHECK_TYPE(index, name, type) do { \
|
||||||
int t = lua_type(L, (index)); \
|
int t = lua_type(L, (index)); \
|
||||||
if (t != (type)) { \
|
if (t != (type)) { \
|
||||||
|
std::string traceback = script_get_backtrace(L); \
|
||||||
throw LuaError(std::string("Invalid ") + (name) + \
|
throw LuaError(std::string("Invalid ") + (name) + \
|
||||||
" (expected " + lua_typename(L, (type)) + \
|
" (expected " + lua_typename(L, (type)) + \
|
||||||
" got " + lua_typename(L, t) + ")."); \
|
" got " + lua_typename(L, t) + ").\n" + traceback); \
|
||||||
} \
|
} \
|
||||||
} while(0)
|
} while(0)
|
||||||
#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
|
#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
|
||||||
|
|
|
@ -54,7 +54,9 @@ void ScriptApiEnv::environment_Step(float dtime)
|
||||||
try {
|
try {
|
||||||
runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
|
runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
|
||||||
} catch (LuaError &e) {
|
} catch (LuaError &e) {
|
||||||
getServer()->setAsyncFatalError(e.what());
|
getServer()->setAsyncFatalError(
|
||||||
|
std::string("environment_Step: ") + e.what() + "\n"
|
||||||
|
+ script_get_backtrace(L));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,7 +77,9 @@ void ScriptApiEnv::player_event(ServerActiveObject *player, const std::string &t
|
||||||
try {
|
try {
|
||||||
runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
|
runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
|
||||||
} catch (LuaError &e) {
|
} catch (LuaError &e) {
|
||||||
getServer()->setAsyncFatalError(e.what());
|
getServer()->setAsyncFatalError(
|
||||||
|
std::string("player_event: ") + e.what() + "\n"
|
||||||
|
+ script_get_backtrace(L) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,7 +241,9 @@ void ScriptApiEnv::on_emerge_area_completion(
|
||||||
try {
|
try {
|
||||||
PCALL_RES(lua_pcall(L, 4, 0, error_handler));
|
PCALL_RES(lua_pcall(L, 4, 0, error_handler));
|
||||||
} catch (LuaError &e) {
|
} catch (LuaError &e) {
|
||||||
server->setAsyncFatalError(e.what());
|
server->setAsyncFatalError(
|
||||||
|
std::string("on_emerge_area_completion: ") + e.what() + "\n"
|
||||||
|
+ script_get_backtrace(L));
|
||||||
}
|
}
|
||||||
|
|
||||||
lua_pop(L, 1); // Pop error handler
|
lua_pop(L, 1); // Pop error handler
|
||||||
|
|
|
@ -107,7 +107,8 @@ void *ServerThread::run()
|
||||||
} catch (con::ConnectionBindFailed &e) {
|
} catch (con::ConnectionBindFailed &e) {
|
||||||
m_server->setAsyncFatalError(e.what());
|
m_server->setAsyncFatalError(e.what());
|
||||||
} catch (LuaError &e) {
|
} catch (LuaError &e) {
|
||||||
m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
|
m_server->setAsyncFatalError(
|
||||||
|
"ServerThread::run Lua: " + std::string(e.what()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -487,7 +488,7 @@ void Server::step(float dtime)
|
||||||
g_settings->get("kick_msg_crash"),
|
g_settings->get("kick_msg_crash"),
|
||||||
g_settings->getBool("ask_reconnect_on_crash"));
|
g_settings->getBool("ask_reconnect_on_crash"));
|
||||||
}
|
}
|
||||||
throw ServerError(async_err);
|
throw ServerError("AsyncErr: " + async_err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue