diff options
Diffstat (limited to 'src/server/worldserver/Master.cpp')
| -rwxr-xr-x | src/server/worldserver/Master.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 36ac9cabed7..e4f51736c14 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -49,8 +49,8 @@ extern int m_ServiceStatus; #endif -/// Handle cored's termination signals -class CoredSignalHandler : public Trinity::SignalHandler +/// Handle worldservers's termination signals +class WorldServerSignalHandler : public Trinity::SignalHandler { public: virtual void HandleSignal(int SigNum) @@ -123,7 +123,7 @@ int Master::Run() BigNumber seed1; seed1.SetRand(16 * 8); - sLog->outString("%s (core-daemon)", _FULLVERSION); + sLog->outString("%s (worldserver-daemon)", _FULLVERSION); sLog->outString("<Ctrl-C> to stop.\n"); sLog->outString(" ______ __"); @@ -143,7 +143,7 @@ int Master::Run() sLog->outString("\n"); #endif //USE_SFMT_FOR_RNG - /// worldd PID file creation + /// worldserver PID file creation std::string pidfile = sConfig->GetStringDefault("PidFile", ""); if (!pidfile.empty()) { @@ -168,12 +168,12 @@ int Master::Run() sWorld->SetInitialWorldSettings(); // Initialise the signal handlers - CoredSignalHandler SignalINT, SignalTERM; + WorldServerSignalHandler SignalINT, SignalTERM; #ifdef _WIN32 - CoredSignalHandler SignalBREAK; + WorldServerSignalHandler SignalBREAK; #endif /* _WIN32 */ - // Register core's signal handlers + // Register worldserver's signal handlers ACE_Sig_Handler Handler; Handler.register_handler(SIGINT, &SignalINT); Handler.register_handler(SIGTERM, &SignalTERM); @@ -216,11 +216,11 @@ int Master::Run() if (!curAff) { - sLog->outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for Trinityd. Accessible processors bitmask (hex): %x", Aff, appAff); + sLog->outError("Processors marked in UseProcessors bitmask (hex) %x are not accessible for the worldserver. Accessible processors bitmask (hex): %x", Aff, appAff); } else { - if (SetProcessAffinityMask(hProcess,curAff)) + if (SetProcessAffinityMask(hProcess, curAff)) sLog->outString("Using processors (bitmask, hex): %x", curAff); else sLog->outError("Can't set used processors (hex): %x", curAff); @@ -235,9 +235,9 @@ int Master::Run() if (Prio) { if (SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) - sLog->outString("TrinityCore process priority class set to HIGH"); + sLog->outString("worldserver process priority class set to HIGH"); else - sLog->outError("Can't set Trinityd process priority class."); + sLog->outError("Can't set worldserver process priority class."); sLog->outString(""); } } |