aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-03-11 20:59:21 +0100
committerjackpoz <giacomopoz@gmail.com>2015-03-11 20:59:21 +0100
commit9948e633abaf0b5349ae3833fa3abc24451576c0 (patch)
tree6f7637ae214ffb8423a5074be854419ffe031c19 /src/server/worldserver/Main.cpp
parentacc235a0f8a19b528cab736987ca14086308d829 (diff)
Revert "Core/Server: Catch exceptions in int main()"
This reverts commit 958999ff5cc779e81b9a23789f84c292d79d1341. Closes #14329
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp22
1 files changed, 2 insertions, 20 deletions
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)