BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Prepend "Lua: " before lua exceptions

Browse Source 
src/server.cpp
src/emerge.cpp
This commit is contained in:
Břetislav Štec 2015-08-01 22:52:28 +02:00 committed by kwolekr
parent c4287a0d68
commit a5e5aa5be9
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emerge.cpp
View File

@ -494,8 +494,8 @@ void *EmergeThread::Thread()
try { // takes about 90ms with -O1 on an e3-1230v2 try { // takes about 90ms with -O1 on an e3-1230v2
m_server->getScriptIface()->environment_OnGenerated( m_server->getScriptIface()->environment_OnGenerated(
minp, maxp, mapgen->blockseed); minp, maxp, mapgen->blockseed);
} catch(LuaError &e) { } catch (LuaError &e) {
m_server->setAsyncFatalError(e.what()); m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
} }
EMERGE_DBG_OUT("ended up with: " << analyze_block(block)); EMERGE_DBG_OUT("ended up with: " << analyze_block(block));

29
src/server.cpp
View File

@ -86,7 +86,7 @@ public:
void * Thread(); void * Thread();
}; };
void * ServerThread::Thread() void *ServerThread::Thread()
{ {
log_register_thread("ServerThread"); log_register_thread("ServerThread");
@ -99,33 +99,22 @@ void * ServerThread::Thread()
porting::setThreadName("ServerThread"); porting::setThreadName("ServerThread");
while(!StopRequested()) while (!StopRequested()) {
{ try {
try{
//TimeTaker timer("AsyncRunStep() + Receive()"); //TimeTaker timer("AsyncRunStep() + Receive()");
m_server->AsyncRunStep(); m_server->AsyncRunStep();
m_server->Receive(); m_server->Receive();
} } catch (con::NoIncomingDataException &e) {
catch(con::NoIncomingDataException &e) } catch (con::PeerNotFoundException &e) {
{
}
catch(con::PeerNotFoundException &e)
{
infostream<<"Server: PeerNotFoundException"<<std::endl; infostream<<"Server: PeerNotFoundException"<<std::endl;
} } catch (ClientNotFoundException &e) {
catch(ClientNotFoundException &e) } catch (con::ConnectionBindFailed &e) {
{
}
catch(con::ConnectionBindFailed &e)
{
m_server->setAsyncFatalError(e.what());
}
catch(LuaError &e)
{
m_server->setAsyncFatalError(e.what()); m_server->setAsyncFatalError(e.what());
} catch (LuaError &e) {
m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
} }
} }