Attachment 157987 Details for Bug 245894 – Removing startpidfile and pidfile on shutdown

[patch] Removing startpidfile and pidfile on shutdown

01_remove_pid_files.patch (text/plain), 2.30 KB, created by Masato Taruishi on 2007-06-27 09:36:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masato Taruishi

Created: 2007-06-27 09:36:08 UTC

Size: 2.30 KB

patch

obsolete

>Index: ldap/servers/slapd/daemon.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
>retrieving revision 1.13
>diff -u -r1.13 daemon.c
>--- ldap/servers/slapd/daemon.c	7 Mar 2007 01:53:36 -0000	1.13
>+++ ldap/servers/slapd/daemon.c	27 Jun 2007 08:41:23 -0000
>@@ -376,6 +376,7 @@
> static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix);
> #endif
> static int write_pid_file();
>+static void remove_pid_file();
> static int init_shutdown_detect();
> #ifdef _WIN32
> static int clear_signal(fd_set *readfdset);
>@@ -712,6 +713,9 @@
> 	}
> 	/* We get here when the server is shutting down */
> 	/* Do what we have to do before death */
>+	
>+	/* Now we remove the pid file, indicating that the server is stopping listening for connections */
>+	remove_pid_file();
> 
> 	connection_table_abandon_all_operations(the_connection_table);	/* abandon all operations in progress */
> 	
>@@ -2459,6 +2463,8 @@
> 	ReportSlapdEvent(EVENTLOG_INFORMATION_TYPE, MSG_SERVER_STARTED, 0, NULL );
> 	return 0;
> }
>+
>+static void remove_pid_file() {}
> #else /* WIN32 */
> /* On UNIX, we create a file with our PID in it */
> static int
>@@ -2479,6 +2485,12 @@
> 		return -1;
> 	}
> }
>+
>+static void
>+remove_pid_file()
>+{
>+	unlink( get_pid_file() );
>+}
> #endif /* WIN32 */
> 
> static void
>Index: ldap/servers/slapd/main.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
>retrieving revision 1.18
>diff -u -r1.18 main.c
>--- ldap/servers/slapd/main.c	27 Feb 2007 02:57:30 -0000	1.18
>+++ ldap/servers/slapd/main.c	27 Jun 2007 08:41:24 -0000
>@@ -591,6 +591,9 @@
> 	ReportSlapdEvent(EVENTLOG_INFORMATION_TYPE, MSG_SERVER_STARTED, 0, NULL );
> 	return 0;
> }
>+
>+static void remove_start_pid_file() {}
>+
> #else /* WIN32 */
> /* On UNIX, we create a file with our PID in it */
> static int
>@@ -611,6 +614,12 @@
> 		return -1;
> 	}
> }
>+
>+static void remove_start_pid_file()
>+{
>+	unlink( start_pid_file );
>+}
>+
> #endif /* WIN32 */
> 
> 
>@@ -1179,6 +1188,7 @@
> 	/* Clean up the mutex used to interlock processes, before we exit */
> 	remove_slapd_process();
> #endif
>+   remove_start_pid_file();
> #if ( defined( hpux ) || defined( irix ) || defined( aix ) || defined( OSF1 ))
> 	exit( 0 );
> #else

Actions: View | Diff

Attachments on bug 245894: 157987 | 157993 | 329851 | 332647