Refactor: libcrmcommon: add pcmk__server_message_type()

ClusterLabs · Jul 17, 2024 · 9fe937d · 9fe937d
1 parent db60945
commit 9fe937d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/include/crm/common/servers_internal.h b/include/crm/common/servers_internal.h
@@ -18,6 +18,7 @@ extern "C" {
 
 const char *pcmk__server_log_name(enum pcmk_ipc_server server);
 const char *pcmk__server_ipc_name(enum pcmk_ipc_server server);
+const char *pcmk__server_message_type(enum pcmk_ipc_server server);
 
 #ifdef __cplusplus
 }

diff --git a/lib/cluster/cpg.c b/lib/cluster/cpg.c
@@ -293,20 +293,9 @@ ais_dest(const pcmk__cpg_host_t *host)
 static inline const char *
 msg_type2text(enum pcmk_ipc_server type)
 {
-    switch (type) {
-        case pcmk_ipc_attrd:
-            return "attrd";
-        case pcmk_ipc_based:
-            return "cib";
-        case pcmk_ipc_controld:
-            return "crmd";
-        case pcmk_ipc_execd:
-            return "lrmd";
-        case pcmk_ipc_fenced:
-            return "stonith-ng";
-        default:
-            return "unknown";
-    }
+    const char *name = pcmk__server_message_type(type);
+
+    return pcmk__s(name, "unknown");
 }
 
 /*!

diff --git a/lib/common/servers.c b/lib/common/servers.c
@@ -125,3 +125,19 @@ pcmk__server_ipc_name(enum pcmk_ipc_server server)
               return NULL);
     return server_info[server].ipc_names[0];
 }
+
+/*!
+ * \internal
+ * \brief Return the (primary) message type for a server
+ *
+ * \param[in] server  Server to get message type for
+ *
+ * \return Message type for server (or NULL if invalid)
+ */
+const char *
+pcmk__server_message_type(enum pcmk_ipc_server server)
+{
+    CRM_CHECK((server > 0) && (server < PCMK__NELEM(server_info)),
+              return NULL);
+    return server_info[server].message_types[0];
+}