Refactor: daemons: Add attrd_cluster_disconnect.

And move the definition of attrd_cluster into attrdd_corosync.c where it
belongs.

Author: clumens

daemons/attrd/attrd_corosync.c

@@ -23,6 +23,8 @@
 
 #include "pacemaker-attrd.h"
 
+pcmk_cluster_t *attrd_cluster = NULL;
+
 /*!
  * \internal
  * \brief Nodes removed by \c attrd_peer_remove()
@@ -499,6 +501,13 @@ attrd_cluster_connect(void)
     return rc;
 }
 
+void
+attrd_cluster_disconnect(void)
+{
+    pcmk_cluster_disconnect(attrd_cluster);
+    pcmk_cluster_free(attrd_cluster);
+}
+
 void
 attrd_peer_clear_failure(pcmk__request_t *request)
 {

daemons/attrd/pacemaker-attrd.c

@@ -56,7 +56,6 @@ static pcmk__supported_format_t formats[] = {
 };
 
 lrmd_t *the_lrmd = NULL;
-pcmk_cluster_t *attrd_cluster = NULL;
 crm_trigger_t *attrd_config_read = NULL;
 crm_exit_t attrd_exit_status = CRM_EX_OK;
 
@@ -204,8 +203,7 @@ main(int argc, char **argv)
 
         attrd_free_removed_peers();
         attrd_free_waitlist();
-        pcmk_cluster_disconnect(attrd_cluster);
-        pcmk_cluster_free(attrd_cluster);
+        attrd_cluster_disconnect();
         g_hash_table_destroy(attributes);
     }
 

daemons/attrd/pacemaker-attrd.h

@@ -191,6 +191,7 @@ void attrd_free_removed_peers(void);
 void attrd_erase_removed_peer_attributes(void);
 
 int attrd_cluster_connect(void);
+void attrd_cluster_disconnect(void);
 void attrd_broadcast_value(const attribute_t *a, const attribute_value_t *v);
 void attrd_peer_update(const pcmk__node_status_t *peer, xmlNode *xml,
                        const char *host, bool filter);