josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/WorldServer: Some minor text and code style clean up.

Browse Source
This commit is contained in:
runningnak3d
2011-04-12 16:46:37 -04:00
parent c41839a243
commit e196dd80bd
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/worldserver/Main.cpp
+3 -3
View File
@@ -37,9 +37,9 @@
#ifdef _WIN32 #ifdef _WIN32
#include "ServiceWin32.h" #include "ServiceWin32.h"
char serviceName[] = "TrinityCore"; char serviceName[] = "worldserver";
char serviceLongName[] = "Trinity core service"; char serviceLongName[] = "TrinityCore world service";
char serviceDescription[] = "Massive Network Game Object Server"; char serviceDescription[] = "TrinityCore World of Warcraft emulator world service";
/* /*
* -1 - not in service mode * -1 - not in service mode
* 0 - stopped * 0 - stopped
src/server/worldserver/Master.cpp
+10 -10
View File
@@ -49,8 +49,8 @@
extern int m_ServiceStatus; extern int m_ServiceStatus;
#endif #endif
/// Handle cored's termination signals /// Handle worldservers's termination signals
class CoredSignalHandler : public Trinity::SignalHandler class WorldServerSignalHandler : public Trinity::SignalHandler
{ {
public: public:
virtual void HandleSignal(int SigNum) virtual void HandleSignal(int SigNum)
@@ -123,7 +123,7 @@ int Master::Run()
BigNumber seed1; BigNumber seed1;
seed1.SetRand(16 * 8); 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("<Ctrl-C> to stop.\n");
sLog->outString(" ______ __"); sLog->outString(" ______ __");
@@ -143,7 +143,7 @@ int Master::Run()
sLog->outString("\n"); sLog->outString("\n");
#endif //USE_SFMT_FOR_RNG #endif //USE_SFMT_FOR_RNG
/// worldd PID file creation /// worldserver PID file creation
std::string pidfile = sConfig->GetStringDefault("PidFile", ""); std::string pidfile = sConfig->GetStringDefault("PidFile", "");
if (!pidfile.empty()) if (!pidfile.empty())
{ {
@@ -168,12 +168,12 @@ int Master::Run()
sWorld->SetInitialWorldSettings(); sWorld->SetInitialWorldSettings();
// Initialise the signal handlers // Initialise the signal handlers
CoredSignalHandler SignalINT, SignalTERM; WorldServerSignalHandler SignalINT, SignalTERM;
#ifdef _WIN32 #ifdef _WIN32
CoredSignalHandler SignalBREAK; WorldServerSignalHandler SignalBREAK;
#endif /* _WIN32 */ #endif /* _WIN32 */
// Register core's signal handlers // Register worldserver's signal handlers
ACE_Sig_Handler Handler; ACE_Sig_Handler Handler;
Handler.register_handler(SIGINT, &SignalINT); Handler.register_handler(SIGINT, &SignalINT);
Handler.register_handler(SIGTERM, &SignalTERM); Handler.register_handler(SIGTERM, &SignalTERM);
@@ -216,7 +216,7 @@ int Master::Run()
if (!curAff) 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 else
{ {
@@ -235,9 +235,9 @@ int Master::Run()
if (Prio) if (Prio)
{ {
if (SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) 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 else
sLog->outError("Can't set Trinityd process priority class."); sLog->outError("Can't set worldserver process priority class.");
sLog->outString(""); sLog->outString("");
} }
} }