Refactor: based: Move based_shutdown() to pacemaker-based.c

And make it static. It seems logical to have it in the same file as the
main() function.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

daemons/based/based_callbacks.c

@@ -34,8 +34,6 @@
 
 #include <pacemaker-based.h>
 
-#define EXIT_ESCALATION_MS 10000
-
 static mainloop_timer_t *digest_timer = NULL;
 static long long ping_seq = 0;
 static char *ping_digest = NULL;
@@ -823,57 +821,6 @@ based_process_request(xmlNode *request, bool privileged,
     return rc;
 }
 
-static gboolean
-cib_force_exit(gpointer data)
-{
-    pcmk__notice("Exiting immediately after %s without shutdown acknowledgment",
-                 pcmk__readable_interval(EXIT_ESCALATION_MS));
-    based_terminate(CRM_EX_ERROR);
-    return FALSE;
-}
-
-void
-based_shutdown(int nsig)
-{
-    int active = 0;
-    xmlNode *notification = NULL;
-
-    if (cib_shutdown_flag) {
-        // Already shutting down
-        return;
-    }
-
-    cib_shutdown_flag = true;
-
-    /* The client count should be 0 by now. If it isn't, that means GLib had
-     * some other reference to a remote client's source when we dropped the
-     * remote client. This is believed not to be possible.
-     *
-     * If this occurs, continue the shutdown. The clients will be dropped
-     * eventually.
-     */
-    CRM_LOG_ASSERT(pcmk__ipc_client_count() == 0);
-
-    active = pcmk__cluster_num_active_nodes();
-    if (active < 2) {
-        pcmk__info("Exiting without sending shutdown request (no active "
-                   "peers)");
-        based_terminate(CRM_EX_OK);
-        return;
-    }
-
-    pcmk__info("Sending shutdown request to %d peers", active);
-
-    notification = pcmk__xe_create(NULL, PCMK__XE_EXIT_NOTIFICATION);
-    pcmk__xe_set(notification, PCMK__XA_T, PCMK__VALUE_CIB);
-    pcmk__xe_set(notification, PCMK__XA_CIB_OP, PCMK__CIB_REQUEST_SHUTDOWN);
-
-    pcmk__cluster_send_message(NULL, pcmk_ipc_based, notification);
-    pcmk__xml_free(notification);
-
-    pcmk__create_timer(EXIT_ESCALATION_MS, cib_force_exit, NULL);
-}
-
 /*!
  * \internal
  * \brief Close remote sockets, free the global CIB and quit

daemons/based/based_callbacks.h

@@ -18,7 +18,6 @@
 
 int based_process_request(xmlNode *request, bool privileged,
                           const pcmk__client_t *client);
-void based_shutdown(int nsig);
 void based_terminate(int exit_status);
 
 #endif // BASED_CALLBACKS__H

daemons/based/pacemaker-based.c

@@ -30,6 +30,7 @@
 
 #include <pacemaker-based.h>
 
+#define EXIT_ESCALATION_MS 10000
 #define SUMMARY "daemon for managing the configuration of a Pacemaker cluster"
 
 bool cib_shutdown_flag = false;
@@ -156,6 +157,57 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group)
     return context;
 }
 
+static gboolean
+based_force_exit(gpointer data)
+{
+    pcmk__notice("Exiting immediately after %s without shutdown acknowledgment",
+                 pcmk__readable_interval(EXIT_ESCALATION_MS));
+    based_terminate(CRM_EX_ERROR);
+    return G_SOURCE_REMOVE;
+}
+
+static void
+based_shutdown(int nsig)
+{
+    int active = 0;
+    xmlNode *notification = NULL;
+
+    if (cib_shutdown_flag) {
+        // Already shutting down
+        return;
+    }
+
+    cib_shutdown_flag = true;
+
+    /* The client count should be 0 by now. If it isn't, that means GLib had
+     * some other reference to a remote client's source when we dropped the
+     * remote client. This is believed not to be possible.
+     *
+     * If this occurs, continue the shutdown. The clients will be dropped
+     * eventually.
+     */
+    CRM_LOG_ASSERT(pcmk__ipc_client_count() == 0);
+
+    active = pcmk__cluster_num_active_nodes();
+    if (active < 2) {
+        pcmk__info("Exiting without sending shutdown request (no active "
+                   "peers)");
+        based_terminate(CRM_EX_OK);
+        return;
+    }
+
+    pcmk__info("Sending shutdown request to %d peers", active);
+
+    notification = pcmk__xe_create(NULL, PCMK__XE_EXIT_NOTIFICATION);
+    pcmk__xe_set(notification, PCMK__XA_T, PCMK__VALUE_CIB);
+    pcmk__xe_set(notification, PCMK__XA_CIB_OP, PCMK__CIB_REQUEST_SHUTDOWN);
+
+    pcmk__cluster_send_message(NULL, pcmk_ipc_based, notification);
+    pcmk__xml_free(notification);
+
+    pcmk__create_timer(EXIT_ESCALATION_MS, based_force_exit, NULL);
+}
+
 int
 main(int argc, char **argv)
 {