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
+13 -13
View File
@@ -37,9 +37,9 @@
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "TrinityCore";
char serviceLongName[] = "Trinity core service";
char serviceDescription[] = "Massive Network Game Object Server";
char serviceName[] = "worldserver";
char serviceLongName[] = "TrinityCore world service";
char serviceDescription[] = "TrinityCore World of Warcraft emulator world service";
/*
* -1 - not in service mode
* 0 - stopped
@@ -74,12 +74,12 @@ extern int main(int argc, char **argv)
{
///- Command line parsing to get the configuration file name
char const* cfg_file = _TRINITY_CORE_CONFIG;
int c=1;
int c = 1;
while( c < argc )
{
if( strcmp(argv[c],"-c") == 0)
if (strcmp(argv[c], "-c") == 0)
{
if( ++c >= argc )
if (++c >= argc)
{
sLog->outError("Runtime-Error: -c option requires an input argument");
usage(argv[0]);
@@ -93,34 +93,34 @@ extern int main(int argc, char **argv)
////////////
//Services//
////////////
if( strcmp(argv[c],"-s") == 0)
if (strcmp(argv[c], "-s") == 0)
{
if( ++c >= argc )
if (++c >= argc)
{
sLog->outError("Runtime-Error: -s option requires an input argument");
usage(argv[0]);
return 1;
}
if( strcmp(argv[c],"install") == 0)
if (strcmp(argv[c], "install") == 0)
{
if (WinServiceInstall())
sLog->outString("Installing service");
return 1;
}
else if( strcmp(argv[c],"uninstall") == 0)
else if (strcmp(argv[c], "uninstall") == 0)
{
if(WinServiceUninstall())
if (WinServiceUninstall())
sLog->outString("Uninstalling service");
return 1;
}
else
{
sLog->outError("Runtime-Error: unsupported option %s",argv[c]);
sLog->outError("Runtime-Error: unsupported option %s", argv[c]);
usage(argv[0]);
return 1;
}
}
if( strcmp(argv[c],"--service") == 0)
if (strcmp(argv[c], "--service") == 0)
{
WinServiceRun();
}
src/server/worldserver/Master.cpp
+11 -11
View File
@@ -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("");
}
}