(main) [_WIN32]: Move install_service() so the config_file
can be verified before installing.
This commit is contained in:
parent
0ba025cb4b
commit
46a11d0d93
1 changed files with 5 additions and 2 deletions
|
@ -188,8 +188,6 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
if (install_service_set)
|
|
||||||
return install_service(argv[0], service_name, datadir_set, config_file);
|
|
||||||
if (remove_service_set)
|
if (remove_service_set)
|
||||||
return remove_service(service_name);
|
return remove_service(service_name);
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
|
@ -200,6 +198,11 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
emp_config(config_file);
|
emp_config(config_file);
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
if (install_service_set)
|
||||||
|
return install_service(argv[0], service_name, datadir_set, config_file);
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
if (daemon != 0) {
|
if (daemon != 0) {
|
||||||
SERVICE_TABLE_ENTRY DispatchTable[]={{"Empire Server", service_main},{NULL, NULL}};
|
SERVICE_TABLE_ENTRY DispatchTable[]={{"Empire Server", service_main},{NULL, NULL}};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue