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

plugins: pidfile: Handle conditions for PID files in sub-directories

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2020-04-22 21:15:48 +02:00
1 parent 6306c757a2
commit 1a881389b2
1 file changed
+11 -8
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pidfile.c
+11 -8
View File
@@ -103,19 +103,22 @@ static int watcher_del(struct context *ctx, struct wd_entry *wde)
return 0; return 0;
} }
static void update_conds(char *name, uint32_t mask) static void update_conds(char *dir, char *name, uint32_t mask)
{ {
svc_t *svc;
char cond[MAX_COND_LEN]; char cond[MAX_COND_LEN];
char fn[PATH_MAX];
svc_t *svc;
_d("name: %s", name); _d("Got dir: %s, name: %s, mask: %08x", dir, name, mask);
svc = svc_find_by_pidfile(name); snprintf(fn, sizeof(fn), "%s/%s", dir, name);
svc = svc_find_by_pidfile(fn);
if (!svc) { if (!svc) {
_d("pidfile: No matching svc for %s", name); _d("pidfile: No matching svc for %s", fn);
return; return;
} }
_d("Event %s for svc %s", name, svc->cmd); _d("pidfile: Found svc %s for %s with pid %d", svc->name, fn, svc->pid);
mkcond(svc, cond, sizeof(cond)); mkcond(svc, cond, sizeof(cond));
if (mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) { if (mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) {
@@ -154,7 +157,7 @@ static void scan_for_pidfiles(struct context *ctx, char *dir, int len)
for (i = 0; i < gl.gl_pathc; i++) { for (i = 0; i < gl.gl_pathc; i++) {
_d("scan found %s", gl.gl_pathv[i]); _d("scan found %s", gl.gl_pathv[i]);
update_conds(gl.gl_pathv[i], IN_CREATE); update_conds(dir, gl.gl_pathv[i], IN_CREATE);
} }
globfree(&gl); globfree(&gl);
} }
@@ -246,7 +249,7 @@ static void pidfile_callback(void *arg, int fd, int events)
} }
if (ev->mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) if (ev->mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO))
update_conds(ev->name, ev->mask); update_conds(wde->path, ev->name, ev->mask);
} }
done: done:
free(buf); free(buf);