mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4241 write pid / args file before starting backends

Browse Source
This commit is contained in:
Howard Chu 2005-12-02 11:47:10 +00:00
parent 5e3820fd7a
commit 3165691cbf
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/main.c
View File

@ -729,20 +729,6 @@ unhandled_option:;
mal_leaktrace(1);
#endif
/*
* FIXME: moved here from slapd_daemon_task()
* because back-monitor db_open() needs it
*/
time( &starttime );
if ( slap_startup( NULL ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
goto shutdown;
}
Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
if ( slapd_pid_file != NULL ) {
FILE *fp = fopen( slapd_pid_file, "w" );
@ -758,7 +744,7 @@ unhandled_option:;
slapd_pid_file = NULL;
rc = 1;
goto shutdown;
goto destroy;
}
fprintf( fp, "%d\n", (int) getpid() );
@ -780,7 +766,7 @@ unhandled_option:;
slapd_args_file = NULL;
rc = 1;
goto shutdown;
goto destroy;
}
for ( i = 0; i < g_argc; i++ ) {
@ -790,6 +776,20 @@ unhandled_option:;
fclose( fp );
}
/*
* FIXME: moved here from slapd_daemon_task()
* because back-monitor db_open() needs it
*/
time( &starttime );
if ( slap_startup( NULL ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
goto shutdown;
}
Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
lutil_LogStartedEvent( serverName, slap_debug, configfile ?