From 9948e633abaf0b5349ae3833fa3abc24451576c0 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
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/worldserver/Main.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'src/server/worldserver')

diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 06d8775440a..7b47dba8759 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -92,7 +92,8 @@ void ShutdownCLIThread(std::thread* cliThread);
 void ShutdownThreadPool(std::vector<std::thread>& threadPool);
 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;
@@ -288,25 +289,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)
-- 
cgit v1.2.3