Fixed issue 497
This commit is contained in:
parent
749a4140f3
commit
f3e4c6dede
|
@ -173,7 +173,20 @@ CApp::parseArgs(int argc, const char* const* argv, int& i)
|
||||||
// parse options
|
// parse options
|
||||||
for (i = 1; i < argc; ++i) {
|
for (i = 1; i < argc; ++i) {
|
||||||
|
|
||||||
if (parseArg(argc, argv, i)) {
|
#if SYSAPI_WIN32
|
||||||
|
// suggest that user installs as a windows service. when launched as
|
||||||
|
// service, process should automatically detect that it should run in
|
||||||
|
// daemon mode.
|
||||||
|
if (argsBase().m_daemon) {
|
||||||
|
LOG((CLOG_ERR
|
||||||
|
"The --daemon argument is not supported on Windows. "
|
||||||
|
"Instead, install %s as a service (--service install).",
|
||||||
|
argsBase().m_pname));
|
||||||
|
m_bye(kExitArgs);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
else if (parseArg(argc, argv, i)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -128,15 +128,6 @@ CServerApp::parseArgs(int argc, const char* const* argv)
|
||||||
m_bye(kExitArgs);
|
m_bye(kExitArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if SYSAPI_WIN32
|
|
||||||
// if user wants to run as daemon, but process not launched from service launcher...
|
|
||||||
if (args().m_daemon && !CArchMiscWindows::wasLaunchedAsService()) {
|
|
||||||
LOG((CLOG_ERR "cannot launch as daemon if process not started through "
|
|
||||||
"service host (use '--service start' argument instead)"));
|
|
||||||
m_bye(kExitArgs);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// set log filter
|
// set log filter
|
||||||
if (!CLOG->setFilter(args().m_logFilter)) {
|
if (!CLOG->setFilter(args().m_logFilter)) {
|
||||||
LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE,
|
LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE,
|
||||||
|
|
Loading…
Reference in New Issue