Added lua tracebacks to some errors where you have been blind to what… (#5043)

sapier · nerzhul · commit f5070b44542e · 2017-01-15T13:36:53.000+01:00
* Added lua tracebacks to some errors where you have been blind to what actually went wrong
diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -564,7 +564,7 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
 		m_server->getScriptIface()->environment_OnGenerated(
 			minp, maxp, m_mapgen->blockseed);
 	} 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));
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
@@ -26,15 +26,17 @@ extern "C" {
 #include "util/serialize.h"
 #include "util/string.h"
 #include "common/c_converter.h"
+#include "common/c_internal.h"
 #include "constants.h"
 
 
 #define CHECK_TYPE(index, name, type) do { \
 		int t = lua_type(L, (index)); \
 		if (t != (type)) { \
+			std::string traceback = script_get_backtrace(L); \
 			throw LuaError(std::string("Invalid ") + (name) + \
 				" (expected " + lua_typename(L, (type)) + \
-				" got " + lua_typename(L, t) + ")."); \
+				" got " + lua_typename(L, t) + ").\n" + traceback); \
 		} \
 	} while(0)
 #define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
@@ -54,7 +54,9 @@ void ScriptApiEnv::environment_Step(float dtime)
 	try {
 		runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
 	} 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 {
 		runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
 	} 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 {
 		PCALL_RES(lua_pcall(L, 4, 0, error_handler));
 	} 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
diff --git a/src/server.cpp b/src/server.cpp
@@ -107,7 +107,8 @@ void *ServerThread::run()
 		} catch (con::ConnectionBindFailed &e) {
 			m_server->setAsyncFatalError(e.what());
 		} 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->getBool("ask_reconnect_on_crash"));
 		}
-		throw ServerError(async_err);
+		throw ServerError("AsyncErr: " + async_err);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ MapBlock EmergeThread::finishGen(v3s16 pos, BlockMakeData bmdata,`
`564`	`564`	`m_server->getScriptIface()->environment_OnGenerated(`
`565`	`565`	`minp, maxp, m_mapgen->blockseed);`
`566`	`566`	`} catch (LuaError &e) {`
`567`		`- m_server->setAsyncFatalError("Lua: " + std::string(e.what()));`
	`567`	`+ m_server->setAsyncFatalError("Lua: finishGen" + std::string(e.what()));`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`EMERGE_DBG_OUT("ended up with: " << analyze_block(block));`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,9 @@ void ScriptApiEnv::environment_Step(float dtime)`
`54`	`54`	`try {`
`55`	`55`	`runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);`
`56`	`56`	`} catch (LuaError &e) {`
`57`		`- getServer()->setAsyncFatalError(e.what());`
	`57`	`+ getServer()->setAsyncFatalError(`
	`58`	`+ std::string("environment_Step: ") + e.what() + "\n"`
	`59`	`+ + script_get_backtrace(L));`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`
`@@ -75,7 +77,9 @@ void ScriptApiEnv::player_event(ServerActiveObject *player, const std::string &t`
`75`	`77`	`try {`
`76`	`78`	`runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);`
`77`	`79`	`} catch (LuaError &e) {`
`78`		`- getServer()->setAsyncFatalError(e.what());`
	`80`	`+ getServer()->setAsyncFatalError(`
	`81`	`+ std::string("player_event: ") + e.what() + "\n"`
	`82`	`+ + script_get_backtrace(L) );`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`
`@@ -237,7 +241,9 @@ void ScriptApiEnv::on_emerge_area_completion(`
`237`	`241`	`try {`
`238`	`242`	`PCALL_RES(lua_pcall(L, 4, 0, error_handler));`
`239`	`243`	`} catch (LuaError &e) {`
`240`		`- server->setAsyncFatalError(e.what());`
	`244`	`+ server->setAsyncFatalError(`
	`245`	`+ std::string("on_emerge_area_completion: ") + e.what() + "\n"`
	`246`	`+ + script_get_backtrace(L));`
`241`	`247`	`}`
`242`	`248`
`243`	`249`	`lua_pop(L, 1); // Pop error handler`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ void *ServerThread::run()`
`107`	`107`	`} catch (con::ConnectionBindFailed &e) {`
`108`	`108`	`m_server->setAsyncFatalError(e.what());`
`109`	`109`	`} catch (LuaError &e) {`
`110`		`- m_server->setAsyncFatalError("Lua: " + std::string(e.what()));`
	`110`	`+ m_server->setAsyncFatalError(`
	`111`	`+ "ServerThread::run Lua: " + std::string(e.what()));`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`
`@@ -487,7 +488,7 @@ void Server::step(float dtime)`
`487`	`488`	`g_settings->get("kick_msg_crash"),`
`488`	`489`	`g_settings->getBool("ask_reconnect_on_crash"));`
`489`	`490`	`}`
`490`		`- throw ServerError(async_err);`
	`491`	`+ throw ServerError("AsyncErr: " + async_err);`
`491`	`492`	`}`
`492`	`493`	`}`
`493`	`494`