mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11502] Fixed windows service run after adding posix daemon support

Browse source
This commit is contained in:
VladimirMangos 2011-05-18 03:54:46 +04:00
parent eb61995f7e
commit 9c65b04f5b
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mangosd/Main.cpp
View file

@ -87,12 +87,14 @@ extern int main(int argc, char **argv)
ACE_Get_Opt cmd_opts(argc, argv, options); ACE_Get_Opt cmd_opts(argc, argv, options);
cmd_opts.long_option("version", 'v'); cmd_opts.long_option("version", 'v');
#ifndef WIN32 // need call before options for posix daemon
if (!sConfig.SetSource(cfg_file)) if (!sConfig.SetSource(cfg_file))
{ {
sLog.outError("Could not find configuration file %s.", cfg_file); sLog.outError("Could not find configuration file %s.", cfg_file);
Log::WaitBeforeContinueIfNeed(); Log::WaitBeforeContinueIfNeed();
return 1; return 1;
} }
#endif
int option; int option;
while ((option = cmd_opts()) != EOF) while ((option = cmd_opts()) != EOF)
@ -161,6 +163,15 @@ extern int main(int argc, char **argv)
} }
} }
#ifdef WIN32 // need call after options for windows service
if (!sConfig.SetSource(cfg_file))
{
sLog.outError("Could not find configuration file %s.", cfg_file);
Log::WaitBeforeContinueIfNeed();
return 1;
}
#endif
sLog.outString( "%s [world-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) ); sLog.outString( "%s [world-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) );
sLog.outString( "<Ctrl-C> to stop.\n\n" ); sLog.outString( "<Ctrl-C> to stop.\n\n" );

15
src/realmd/Main.cpp
View file

@ -96,14 +96,16 @@ extern int main(int argc, char **argv)
ACE_Get_Opt cmd_opts(argc, argv, options); ACE_Get_Opt cmd_opts(argc, argv, options);
cmd_opts.long_option("version", 'v'); cmd_opts.long_option("version", 'v');
int option; #ifndef WIN32 // need call before options for posix daemon
if (!sConfig.SetSource(cfg_file)) if (!sConfig.SetSource(cfg_file))
{ {
sLog.outError("Could not find configuration file %s.", cfg_file); sLog.outError("Could not find configuration file %s.", cfg_file);
Log::WaitBeforeContinueIfNeed(); Log::WaitBeforeContinueIfNeed();
return 1; return 1;
} }
#endif
int option;
while ((option = cmd_opts()) != EOF) while ((option = cmd_opts()) != EOF)
{ {
@ -171,6 +173,15 @@ extern int main(int argc, char **argv)
} }
} }
#ifdef WIN32 // need call after options for windows service
if (!sConfig.SetSource(cfg_file))
{
sLog.outError("Could not find configuration file %s.", cfg_file);
Log::WaitBeforeContinueIfNeed();
return 1;
}
#endif
sLog.Initialize(); sLog.Initialize();
sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) ); sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) );

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11501" #define REVISION_NR "11502"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__