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

pidfile: Ensure svc is always followed by a slash

Browse Source 
A service need no longer be fully qualified path.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2017-01-16 01:02:40 +01:00
1 parent 57181264e9
commit 0cccc629bf
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pidfile.c
+11 -5
View File
@@ -37,6 +37,12 @@ struct context {
int wd; int wd;
}; };
static char *mkcond(char *buf, size_t len, char *nm)
{
snprintf(buf, len, "svc%s%s", nm[0] != '/' ? "/" : "", nm);
return buf;
}
static void pidfile_callback(void *UNUSED(arg), int fd, int UNUSED(events)) static void pidfile_callback(void *UNUSED(arg), int fd, int UNUSED(events))
{ {
static char ev_buf[8 *(sizeof(struct inotify_event) + NAME_MAX + 1) + 1]; static char ev_buf[8 *(sizeof(struct inotify_event) + NAME_MAX + 1) + 1];
@@ -71,7 +77,7 @@ static void pidfile_callback(void *UNUSED(arg), int fd, int UNUSED(events))
/* TODO FIXME XXX WKZ check that pid is controlled by finit */ /* TODO FIXME XXX WKZ check that pid is controlled by finit */
_d("%s: match %s", basename, svc->cmd); _d("%s: match %s", basename, svc->cmd);
snprintf(cond, sizeof(cond), "svc%s", svc->cmd); mkcond(cond, sizeof(cond), svc->cmd);
if (ev->mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY)) { if (ev->mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY)) {
svc_started(svc); svc_started(svc);
cond_set(cond); cond_set(cond);
@@ -88,7 +94,7 @@ static void pidfile_callback(void *UNUSED(arg), int fd, int UNUSED(events))
*/ */
static void pidfile_reconf(void *_null) static void pidfile_reconf(void *_null)
{ {
static char name[MAX_ARG_LEN]; static char cond[MAX_ARG_LEN];
svc_t *svc; svc_t *svc;
(void)(_null); (void)(_null);
int restart = 0; int restart = 0;
@@ -97,12 +103,12 @@ static void pidfile_reconf(void *_null)
restart = 0; restart = 0;
for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) { for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
snprintf(name, MAX_ARG_LEN, "svc%s", svc->cmd); mkcond(cond, sizeof(cond), svc->cmd);
if (svc->state == SVC_RUNNING_STATE && if (svc->state == SVC_RUNNING_STATE &&
!svc_is_changed(svc) && !svc_is_changed(svc) &&
!svc_is_starting(svc) && !svc_is_starting(svc) &&
cond_get(name) != COND_ON) { cond_get(cond) != COND_ON) {
cond_set_path(cond_path(name), COND_ON); cond_set_path(cond_path(cond), COND_ON);
restart = 1; restart = 1;
} }
} }