(start_server, main, service_main): Call emp_config() earlier.

(main): Call loginit() later, after emp_config().  Previously, the
program logged to the default datadir until emp_config().
(init_server, start_sever): Split start_server() into initialization
and actual startup.  Move initialization before disassoc().
(main, init_server): Log server startup only after initialization is
complete.
This commit is contained in:
Markus Armbruster 2005-03-05 20:38:01 +00:00
parent e215af5ac5
commit 830c171dd2
3 changed files with 30 additions and 15 deletions

View file

@ -237,6 +237,7 @@ service_main(DWORD argc, LPTSTR *argv)
sprintf(tbuf, "%s/econfig", datadir);
config_file = tbuf;
}
emp_config(config_file);
service_status.dwServiceType = SERVICE_WIN32;
service_status.dwCurrentState = SERVICE_START_PENDING;
@ -255,7 +256,8 @@ service_main(DWORD argc, LPTSTR *argv)
}
/* Initialization code goes here. */
start_server(0, config_file);
init_server(0);
start_server(0);
/* Initialization complete - report running status. */
service_status.dwCurrentState = SERVICE_RUNNING;