Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
This commit is contained in:
DDuarte
2014-07-24 03:35:19 +01:00
parent 8bc519a308 7524e2dfda
commit 5193eaac87
25 changed files with 1991 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/authserver/Main.cpp
View File

@@ -123,6 +123,9 @@ int main(int argc, char** argv)
// Set signal handlers
boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);
#if PLATFORM == PLATFORM_WINDOWS
signals.add(SIGBREAK);
#endif
signals.async_wait(SignalHandler);
// Set process priority according to configuration settings
@@ -191,18 +194,10 @@ void StopDB()
MySQL::Library_End();
}
void SignalHandler(const boost::system::error_code& error, int signalNumber)
void SignalHandler(const boost::system::error_code& error, int /*signalNumber*/)
{
if (!error)
{
switch (signalNumber)
{
case SIGINT:
case SIGTERM:
_ioService.stop();
break;
}
}
_ioService.stop();
}
void KeepDatabaseAliveHandler(const boost::system::error_code& error)