From fe41b9c4b816ddc2c7f82032be97229bec49260f Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Mon, 2 Mar 2020 07:22:15 +0100
Subject: [PATCH] Revert "plugins: pidfile: Simplify and clean up developer
 debug messages"

This reverts commit 69016bb8f582f0858c9160e6cfd520a34e47173e.
---
 plugins/pidfile.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/plugins/pidfile.c b/plugins/pidfile.c
index 217f2e66..5616e671 100644
--- a/plugins/pidfile.c
+++ b/plugins/pidfile.c
@@ -55,6 +55,7 @@ static int watcher_add(struct context *ctx, char *path)
 	char *ptr;
 	int fd;
 
+	_d("pidfile: Adding new watcher for path %s", path);
 	ptr = strstr(path, "run/");
 	if (ptr) {
 		char *slash;
@@ -93,6 +94,7 @@ static int watcher_add(struct context *ctx, char *path)
 
 static int watcher_del(struct context *ctx, struct wd_entry *wde)
 {
+	_d("pidfile: Removing watcher for removed path %s", wde->path);
 	TAILQ_REMOVE(&ctx->wd_list, wde, link);
 	inotify_rm_watch(ctx->fd, wde->fd);
 	free(wde->path);
@@ -106,12 +108,15 @@ static void update_conds(char *name, uint32_t mask)
 	svc_t *svc;
 	char cond[MAX_COND_LEN];
 
+	_d("name: %s", name);
 	svc = svc_find_by_pidfile(name);
 	if (!svc) {
 		_d("pidfile: No matching svc for %s", name);
 		return;
 	}
 
+	_d("Event %s for svc %s", name, svc->cmd);
+
 	mkcond(svc, cond, sizeof(cond));
 	if (mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) {
 		svc_started(svc);
@@ -167,6 +172,7 @@ static void handle_dir(struct context *ctx, struct wd_entry *wde, char *name, in
 		return;
 	}
 	snprintf(path, plen, "%s/%s", wde->path, name);
+	_d("pidfile: path is %s", path);
 
 	TAILQ_FOREACH(wde, &ctx->wd_list, link) {
 		if (!strcmp(wde->path, path)) {
@@ -204,12 +210,14 @@ static void pidfile_callback(void *arg, int fd, int events)
 		return;
 	}
 
+	_d("pidfile: Entering ... reading %zu bytes into ev_buf[]", buflen - 1);
 	sz = read(fd, buf, buflen - 1);
 	if (sz <= 0) {
 		_pe("invalid inotify event");
 		goto done;
 	}
 	buf[sz] = 0;
+	_d("pidfile: Read %zd bytes, processing ...", sz);
 
 	off = 0;
 	for (off = 0; off < sz; off += sizeof(*ev) + ev->len) {
@@ -217,6 +225,7 @@ static void pidfile_callback(void *arg, int fd, int events)
 
 		ev = (struct inotify_event *)&buf[off];
 
+		_d("pidfile: path %s, event: 0x%08x", ev->name, ev->mask);
 		if (!ev->mask)
 			continue;
 
@@ -231,6 +240,11 @@ static void pidfile_callback(void *arg, int fd, int events)
 			continue;
 		}
 
+		if (ev->mask & IN_DELETE) {
+			_d("pidfile %s/%s removed ...", wde->path, ev->name);
+			continue;
+		}
+
 		if (ev->mask & (IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO))
 			update_conds(ev->name, ev->mask);
 	}
@@ -291,6 +305,7 @@ static void pidfile_init(void *arg)
 	TAILQ_INIT(&pidfile_ctx.wd_list);
 	if (watcher_add(&pidfile_ctx, path))
 		close(pidfile_ctx.fd);
+	_d("pidfile monitor active");
 }
 
 static struct context pidfile_ctx;