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 f5e647f08a544348d065b25c5e671c7dd24c202b..b0469f7f14a31b00282694e110a43f5345af1a73 100644 (file)
--- 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 d0f3a8ae1a358352355e31a7880edcf8d2aaa8fd..be5a6922c794c8a508d0c3a633f10717aa64ddd9 100644 (file)
--- 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 e7a74468cc2ebe1e3b92942091ccd238b400814b..50aee915aa0a731debb6af5e0340bfc53f6ada44 100644 (file)
--- 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);
+       }
+}