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

Add 'notify:pid' style readiness notifaction and 'readiness none'

Browse Source 
This change expands the readiness notification system in Finit with the
native 'pid' style, which will remain the default readiness in Finit 4.x

For systems that want to transition to Finit 5.x early, a global option
to set 'readiness none' in /etc/finit.conf, has been added.  This change
the service default notification mode to 'notify:none', which can also
be set by Finit 4.x ('readiness pid') for select services.

Fixes #386.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-11-12 19:07:12 +01:00
1 parent 6443995fc9
commit 0b5c555c7f
10 files changed
+88 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/dbus.c
+2 -2
View File
@@ -150,11 +150,11 @@ static void setup(void *arg)
* Note: dbus drops privs after starting up.
*/
if (pidfn) {
snprintf(line, sizeof(line), "[S123456789] cgroup.system name:dbus pid:!%s %s %s -- %s",
snprintf(line, sizeof(line), "[S123456789] cgroup.system notify:none name:dbus pid:!%s %s %s -- %s",
pidfn, cmd, DBUS_ARGS, DBUS_DESC);
free(pidfn);
} else
snprintf(line, sizeof(line), "[S123456789] cgroup.system name:dbus %s %s -- %s",
snprintf(line, sizeof(line), "[S123456789] cgroup.system notify:none name:dbus %s %s -- %s",
cmd, DBUS_ARGS, DBUS_DESC);
conf_save_service(SVC_TYPE_SERVICE, line, "dbus.conf");
plugins/pidfile.c
+4 -4
View File
@@ -88,7 +88,7 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
* systemd style services rely on their respective
* readiness notification. Issue #343
*/
if (!svc->notify)
if (svc->notify == SVC_NOTIFY_PID)
svc_started(svc);
if (!svc_has_pidfile(svc)) {
@@ -121,11 +121,11 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
}
cond_set(cond);
if (!svc->notify)
if (svc->notify == SVC_NOTIFY_PID)
service_ready(svc);
} else if (mask & IN_DELETE) {
cond_clear(cond);
if (!svc->notify)
if (svc->notify == SVC_NOTIFY_PID)
service_ready(svc);
}
}
@@ -240,7 +240,7 @@ static void pidfile_reconf(void *arg)
if (svc_is_changed(svc) || svc_is_starting(svc))
continue;
if (!svc->notify)
if (svc->notify == SVC_NOTIFY_PID)
service_ready(svc);
mkcond(svc, cond, sizeof(cond));