Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '61ba5e4f34211c2f0f286e70d8ace37714ca3c56' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2015_02_23_00_world.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
This commit is contained in:
Carbenium
2015-07-21 22:47:41 +02:00
parent 4a25f01ab9 61ba5e4f34
commit 2bdcce17f8
11 changed files with 571 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/worldserver/Main.cpp
View File

@@ -94,8 +94,7 @@ 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);
/// Launch the Trinity server
extern int main(int argc, char** argv)
int mainImpl(int argc, char** argv)
{
std::string configFile = _TRINITY_CORE_CONFIG;
std::string configService;
@@ -299,6 +298,25 @@ extern int main(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)