From 9948e633abaf0b5349ae3833fa3abc24451576c0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 11 Mar 2015 20:59:21 +0100 Subject: Revert "Core/Server: Catch exceptions in int main()" This reverts commit 958999ff5cc779e81b9a23789f84c292d79d1341. Closes #14329 --- src/server/authserver/Main.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/server/authserver/Main.cpp') diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index c57f8254d9c..cd58ec2bf68 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -58,7 +58,7 @@ boost::asio::deadline_timer _dbPingTimer(_ioService); uint32 _dbPingInterval; LoginDatabaseWorkerPool LoginDatabase; -int mainImpl(int argc, char** argv) +int main(int argc, char** argv) { std::string configFile = _TRINITY_REALM_CONFIG; auto vm = GetConsoleArguments(argc, argv, configFile); @@ -144,24 +144,6 @@ int mainImpl(int argc, char** argv) return 0; } -/// 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 - } -} /// Initialize connection to the database bool StartDB() -- cgit v1.2.3