nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 01:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Core/Worldserver): restyle worldserver lib with astyle (#3463)

Browse Source
This commit is contained in:
Kargatum
2020-09-11 10:41:31 +07:00
committed by GitHub
parent c141be8684
commit d47d6d34f3
11 changed files with 139 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/server/worldserver/Master.cpp
View File

@@ -46,27 +46,27 @@ extern int m_ServiceStatus;
/// Handle worldservers's termination signals
class WorldServerSignalHandler : public acore::SignalHandler
{
public:
virtual void HandleSignal(int sigNum)
public:
virtual void HandleSignal(int sigNum)
{
switch (sigNum)
{
switch (sigNum)
{
case SIGINT:
World::StopNow(RESTART_EXIT_CODE);
break;
case SIGTERM:
case SIGINT:
World::StopNow(RESTART_EXIT_CODE);
break;
case SIGTERM:
#ifdef _WIN32
case SIGBREAK:
if (m_ServiceStatus != 1)
case SIGBREAK:
if (m_ServiceStatus != 1)
#endif
World::StopNow(SHUTDOWN_EXIT_CODE);
break;
break;
/*case SIGSEGV:
sLog->outString("ZOMG! SIGSEGV handled!");
World::StopNow(SHUTDOWN_EXIT_CODE);
break;*/
}
}
}
};
class FreezeDetectorRunnable : public acore::Runnable
@@ -84,7 +84,7 @@ public:
if (!_delayTime)
return;
sLog->outString("Starting up anti-freeze thread (%u seconds max stuck time)...", _delayTime/1000);
sLog->outString("Starting up anti-freeze thread (%u seconds max stuck time)...", _delayTime / 1000);
while (!World::IsStopped())
{
uint32 curtime = getMSTime();
@@ -166,9 +166,9 @@ int Master::Run()
///- Initialize the signal handlers
WorldServerSignalHandler signalINT, signalTERM; //, signalSEGV
#ifdef _WIN32
#ifdef _WIN32
WorldServerSignalHandler signalBREAK;
#endif /* _WIN32 */
#endif /* _WIN32 */
///- Register worldserver's signal handlers
ACE_Sig_Handler handle;
@@ -283,7 +283,7 @@ int Master::Run()
acore::Thread* freezeThread = nullptr;
if (uint32 freezeDelay = sConfigMgr->GetIntDefault("MaxCoreStuckTime", 0))
{
FreezeDetectorRunnable* runnable = new FreezeDetectorRunnable(freezeDelay*1000);
FreezeDetectorRunnable* runnable = new FreezeDetectorRunnable(freezeDelay * 1000);
freezeThread = new acore::Thread(runnable);
freezeThread->setPriority(acore::Priority_Highest);
}
@@ -334,7 +334,7 @@ int Master::Run()
if (cliThread)
{
#ifdef _WIN32
#ifdef _WIN32
// this only way to terminate CLI thread exist at Win32 (alt. way exist only in Windows Vista API)
//_exit(1);
@@ -373,11 +373,11 @@ int Master::Run()
cliThread->wait();
#else
#else
cliThread->destroy();
#endif
#endif
delete cliThread;
}
@@ -411,7 +411,7 @@ bool Master::_StartDB()
if (async_threads < 1 || async_threads > 32)
{
sLog->outError("World database: invalid number of worker threads specified. "
"Please pick a value between 1 and 32.");
"Please pick a value between 1 and 32.");
return false;
}
@@ -435,7 +435,7 @@ bool Master::_StartDB()
if (async_threads < 1 || async_threads > 32)
{
sLog->outError("Character database: invalid number of worker threads specified. "
"Please pick a value between 1 and 32.");
"Please pick a value between 1 and 32.");
return false;
}
@@ -460,7 +460,7 @@ bool Master::_StartDB()
if (async_threads < 1 || async_threads > 32)
{
sLog->outError("Login database: invalid number of worker threads specified. "
"Please pick a value between 1 and 32.");
"Please pick a value between 1 and 32.");
return false;
}