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

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

View file

@ -87,12 +87,14 @@ extern int main(int argc, char **argv)
ACE_Get_Opt cmd_opts(argc, argv, options);
cmd_opts.long_option("version", 'v');
#ifndef WIN32 // need call before options for posix daemon
if (!sConfig.SetSource(cfg_file))
{
sLog.outError("Could not find configuration file %s.", cfg_file);
Log::WaitBeforeContinueIfNeed();
return 1;
}
#endif
int option;
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( "<Ctrl-C> to stop.\n\n" );