aboutsummaryrefslogtreecommitdiff
path: root/src/server/authserver/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/authserver/Main.cpp
parentacc235a0f8a19b528cab736987ca14086308d829 (diff)
Revert "Core/Server: Catch exceptions in int main()"
This reverts commit 958999ff5cc779e81b9a23789f84c292d79d1341. Closes #14329
Diffstat (limited to 'src/server/authserver/Main.cpp')
-rw-r--r--src/server/authserver/Main.cpp20
1 files changed, 1 insertions, 19 deletions
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()