Additional checks for forking services before marking as started

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Author: troglobit

plugins/pidfile.c

@@ -120,14 +120,6 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 	}
 
 	if (mask & (IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) {
-		/*
-		 * only mark native services as started, the s6 and
-		 * systemd style services rely on their respective
-		 * readiness notification.  Issue #343
-		 */
-		if (svc->notify == SVC_NOTIFY_PID)
-			svc_started(svc);
-
 		if (!svc_has_pidfile(svc)) {
 			dbg("Setting %s PID file to %s", svc->name, fn);
 			pid_file_set(svc, fn, 1);
@@ -153,9 +145,23 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 				svc->pid = pid;
 
 				/* Complement log in service.c for non-forking services */
-				logit(LOG_CONSOLE | LOG_NOTICE, "Started %s[%d]", svc_ident(svc, NULL, 0), pid);
+				if (svc->state != SVC_RUNNING_STATE) {
+					if (svc->notify == SVC_NOTIFY_PID)
+						svc_started(svc);
+
+					logit(LOG_CONSOLE | LOG_NOTICE, "Started %s[%d]",
+					      svc_ident(svc, NULL, 0), pid);
+				}
 				cgroup_move_svc(svc);
 			}
+		} else {
+			/*
+			 * only mark native services as started, the s6 and
+			 * systemd style services rely on their respective
+			 * readiness notification.  Issue #343
+			 */
+			if (svc->notify == SVC_NOTIFY_PID)
+				svc_started(svc);
 		}
 
 		if (svc->notify == SVC_NOTIFY_PID)