Revert "Core/Server: Catch exceptions in int main()"

This reverts commit 958999ff5c.

Closes #14329
This commit is contained in:
jackpoz
2015-03-11 20:59:21 +01:00
parent acc235a0f8
commit 9948e633ab
2 changed files with 3 additions and 39 deletions

View File

@@ -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()