diff options
author | jackpoz <giacomopoz@gmail.com> | 2015-03-11 21:07:08 +0100 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2015-03-11 21:07:08 +0100 |
commit | b35578bac3b1b53bc68304cbc1efeed327916037 (patch) | |
tree | ebf0311fc1f6b5ffdb56c3ad32c12d2a2bfed9a0 /src/server/worldserver/Main.cpp | |
parent | 62e2d8e971b73310cf0727967bc0e23376353948 (diff) |
Revert "Core/Server: Catch exceptions in int main()"
This reverts commit e68ca82d4d039a401d03de145111b0a738bb9dd7.
Closes #14329
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r-- | src/server/worldserver/Main.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 362b5b05168..15d08a903b9 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -97,7 +97,8 @@ void ShutdownThreadPool(std::vector<std::thread>& threadPool); bool LoadRealmInfo(); variables_map GetConsoleArguments(int argc, char** argv, std::string& cfg_file, std::string& cfg_service); -int mainImpl(int argc, char** argv) +/// Launch the Trinity server +extern int main(int argc, char** argv) { std::string configFile = _TRINITY_CORE_CONFIG; std::string configService; @@ -305,25 +306,6 @@ int mainImpl(int argc, char** argv) return World::GetExitCode(); } -/// Launch the Trinity server -extern int main(int argc, char** argv) -{ - try - { - return mainImpl(argc, argv); - } - catch (std::exception& ex) - { - std::cerr << "Top-level exception caught:" << ex.what() << "\n"; - -#ifndef NDEBUG // rethrow exception for the debugger - throw; -#else - return 1; -#endif - } -} - void ShutdownCLIThread(std::thread* cliThread) { if (cliThread != nullptr) |