[patch] If pidfile does not exist or is empty, continue

ssd-waitpid.patch (text/plain), 1.37 KB, created by Roy Marples (RETIRED) on 2007-05-13 11:00:37 UTC

Index: src/start-stop-daemon.c
===================================================================
--- src/start-stop-daemon.c	(revision 2696)
+++ src/start-stop-daemon.c	(working copy)
@@ -962,6 +962,7 @@
 	if (START_WAIT > 0) {
 		struct timeval stopat;
 		struct timeval now;
+		bool retestpid = false;
 
 		if (gettimeofday (&stopat, NULL) != 0)
 			eerrorx ("%s: gettimeofday: %s", progname, strerror (errno));
@@ -991,11 +992,21 @@
 				if (kill (pid, 0) == 0)
 					alive = true;
 			} else {
-				if (pidfile && rc_exists (pidfile)) {
-					if (do_stop (NULL, NULL, pidfile, uid, 0, true, false, true) > 0)
+				if (pidfile) {
+					/* The pidfile may not have been written yet - give it some time */
+					if (get_pid (pidfile, true) == -1) {
 						alive = true;
+						retestpid = true;
+					} else {
+						retestpid = false;
+
+						if (do_stop (NULL, NULL, pidfile, uid, 0, true,
+									 false, true) > 0)
+							alive = true;
+					}
 				} else {
-					if (do_stop (exec, cmd, NULL, uid, 0, true, false, true) > 0)
+					if (do_stop (exec, cmd, NULL, uid, 0, true,
+								 false, true) > 0)
 						alive = true;
 				}
 			}
@@ -1006,6 +1017,12 @@
 			if (timercmp (&now, &stopat, >))
 				break;
 		}
+
+		if (retestpid) {
+			if (do_stop (NULL, NULL, pidfile, uid, 0, true,
+						 false, true) < 1)
+				eerrorx ("%s: %s died", progname, exec);
+		}
 	}
 
 	if (svcname)