From: Martin Schwenke <martin@meltin.net>
Date: Thu, 30 Sep 2021 11:10:33 +0000 (+1000)
Subject: ctdb-daemon: Enable log reopening for event daemon
X-Git-Tag: tdb-1.4.6~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51f0380e83c93702a08e29c230bb8d87d472b616;p=thirdparty%2Fsamba.git

ctdb-daemon: Enable log reopening for event daemon

Add and call hook to pass on SIGHUP to eventd.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index f5e647f08a5..b0469f7f14a 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1035,4 +1035,6 @@ int ctdb_event_script_args(struct ctdb_context *ctdb,
 int ctdb_event_script(struct ctdb_context *ctdb,
 		      enum ctdb_event call);
 
+void ctdb_event_reopen_logs(struct ctdb_context *ctdb);
+
 #endif
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index d0f3a8ae1a3..be5a6922c79 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1496,6 +1496,7 @@ static void sighup_hook(void *private_data)
 	if (ctdb->recoverd_pid > 0) {
 		kill(ctdb->recoverd_pid, SIGHUP);
 	}
+	ctdb_event_reopen_logs(ctdb);
 }
 
 /*
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index e7a74468cc2..50aee915aa0 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -837,3 +837,10 @@ int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_event call)
 	/* GCC complains about empty format string, so use %s and "". */
 	return ctdb_event_script_args(ctdb, call, NULL);
 }
+
+void ctdb_event_reopen_logs(struct ctdb_context *ctdb)
+{
+	if (ctdb->ectx->eventd_pid > 0) {
+		kill(ctdb->ectx->eventd_pid, SIGHUP);
+	}
+}