diff options
author | Břetislav Štec <valsiterb@gmail.com> | 2015-08-01 22:52:28 +0200 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2015-08-02 02:17:37 -0400 |
commit | a5e5aa5be978d2f6e23d4eeab04d2ac9beefe170 (patch) | |
tree | 46940d08555ba8c3bac07328b2c6f5848bee9814 /src/server.cpp | |
parent | c4287a0d681abd4728f978d2ac55285cf6a6ecad (diff) | |
download | minetest-a5e5aa5be978d2f6e23d4eeab04d2ac9beefe170.tar.gz minetest-a5e5aa5be978d2f6e23d4eeab04d2ac9beefe170.tar.bz2 minetest-a5e5aa5be978d2f6e23d4eeab04d2ac9beefe170.zip |
Prepend "Lua: " before lua exceptions
src/server.cpp
src/emerge.cpp
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/server.cpp b/src/server.cpp index 70fe5ae2c..8a1465faa 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -86,7 +86,7 @@ public: void * Thread(); }; -void * ServerThread::Thread() +void *ServerThread::Thread() { log_register_thread("ServerThread"); @@ -99,33 +99,22 @@ void * ServerThread::Thread() porting::setThreadName("ServerThread"); - while(!StopRequested()) - { - try{ + while (!StopRequested()) { + try { //TimeTaker timer("AsyncRunStep() + Receive()"); m_server->AsyncRunStep(); m_server->Receive(); - } - catch(con::NoIncomingDataException &e) - { - } - catch(con::PeerNotFoundException &e) - { + } catch (con::NoIncomingDataException &e) { + } catch (con::PeerNotFoundException &e) { infostream<<"Server: PeerNotFoundException"<<std::endl; - } - catch(ClientNotFoundException &e) - { - } - catch(con::ConnectionBindFailed &e) - { - m_server->setAsyncFatalError(e.what()); - } - catch(LuaError &e) - { + } catch (ClientNotFoundException &e) { + } catch (con::ConnectionBindFailed &e) { m_server->setAsyncFatalError(e.what()); + } catch (LuaError &e) { + m_server->setAsyncFatalError("Lua: " + std::string(e.what())); } } |