mirror of
https://github.com/troglobit/finit.git
synced 2026-10-29 12:40:44 +00:00
Simplify readiness handling for s6 style services
No need for special handling of s6 services, we now have the new service_notify_reconf() function that is called on init reload. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
2508495b8c
commit
e83a26b256
1 file changed
+1
-6
+1
-6
@@ -2152,10 +2152,7 @@ void service_ready(svc_t *svc)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "service/%s/ready", svc_ident(svc, NULL, 0));
|
snprintf(buf, sizeof(buf), "service/%s/ready", svc_ident(svc, NULL, 0));
|
||||||
if (svc->notify == 2)
|
cond_set(buf);
|
||||||
cond_set_oneshot(buf); /* exception for s6 */
|
|
||||||
else
|
|
||||||
cond_set(buf);
|
|
||||||
|
|
||||||
if (svc_has_ready(svc))
|
if (svc_has_ready(svc))
|
||||||
service_ready_script(svc);
|
service_ready_script(svc);
|
||||||
@@ -2345,8 +2342,6 @@ restart:
|
|||||||
|
|
||||||
svc_mark_clean(svc);
|
svc_mark_clean(svc);
|
||||||
}
|
}
|
||||||
if (svc->notify == 2 && svc->notify_watcher.fd == 0)
|
|
||||||
service_ready(svc);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in new issue
Block a user