wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-28 12:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reassert both PID and ready conditions when leaving paused state

Browse Source 
Follow-up to issue #386

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-11-13 04:35:31 +01:00
1 parent 92c2efa655
commit 47b0d4cccf
1 file changed
+12 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+12 -5
View File
@@ -2549,6 +2549,8 @@ restart:
svc_mark_clean(svc); svc_mark_clean(svc);
} }
if (svc->notify == SVC_NOTIFY_NONE)
service_ready(svc);
break; break;
} }
break; break;
@@ -2573,11 +2575,16 @@ restart:
svc_set_state(svc, SVC_RUNNING_STATE); svc_set_state(svc, SVC_RUNNING_STATE);
/* Reassert condition if we go from waiting and no change */ /* Reassert condition if we go from waiting and no change */
if (!svc_is_changed(svc)) { if (!svc_is_changed(svc)) {
char name[MAX_COND_LEN]; if (svc->notify == SVC_NOTIFY_PID) {
char name[MAX_COND_LEN];
mkcond(svc, name, sizeof(name)); mkcond(svc, name, sizeof(name));
dbg("Reassert condition %s", name); dbg("Reassert condition %s", name);
cond_set_path(cond_path(name), COND_ON); cond_set_path(cond_path(name), COND_ON);
}
dbg("Reassert %s ready condition", svc_ident(svc, NULL, 0));
service_ready(svc);
} }
break; break;
@@ -2710,7 +2717,7 @@ void service_notify_reconf(void)
if (svc->state != SVC_RUNNING_STATE) if (svc->state != SVC_RUNNING_STATE)
continue; continue;
if (svc_is_changed(svc) || svc_is_starting(svc)) if (svc->notify != SVC_NOTIFY_NONE && (svc_is_changed(svc) || svc_is_starting(svc)))
continue; continue;
service_ready(svc); service_ready(svc);