Merge pull request #1254 from HideoYamauchi/move_alert_func

Low: crmd: Move Alert function to common. (again)
ClusterLabs · Mar 23, 2017 · 0401f26 · 0401f26
2 parents 2c5bb2f + 88740d7
commit 0401f26
Show file tree

Hide file tree

Showing 12 changed files with 722 additions and 673 deletions.
diff --git a/crmd/Makefile.am b/crmd/Makefile.am
@@ -41,7 +41,7 @@ crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
 		$(top_builddir)/lib/lrmd/liblrmd.la			\
 		$(CLUSTERLIBS)
 
-crmd_SOURCES	= main.c crmd.c corosync.c notify.c				\
+crmd_SOURCES	= main.c crmd.c corosync.c crmd_alerts.c				\
 		fsa.c control.c messages.c membership.c callbacks.c attrd.c	\
 		election.c join_client.c join_dc.c subsystems.c throttle.c	\
 		cib.c pengine.c tengine.c lrm.c lrm_state.c remote_lrmd_ra.c	\

diff --git a/crmd/callbacks.c b/crmd/callbacks.c
@@ -146,7 +146,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
                 }
             }
 
-            crmd_notify_node_event(node);
+            crmd_alert_node_event(node);
             break;
 
         case crm_status_processes:

diff --git a/crmd/control.c b/crmd/control.c
@@ -1035,7 +1035,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
 #ifdef RHEL7_COMPAT
     script = crmd_pref(config_hash, "notification-agent");
     value  = crmd_pref(config_hash, "notification-recipient");
-    crmd_enable_notifications(script, value);
+    crmd_enable_alerts(script, value);
 #endif
 
     value = crmd_pref(config_hash, XML_CONFIG_ATTR_DC_DEADTIME);
@@ -1095,7 +1095,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
     }
 
     alerts = first_named_child(output, XML_CIB_TAG_ALERTS);
-    parse_notifications(alerts);
+    parse_alerts(alerts);
 
     set_bit(fsa_input_register, R_READ_CONFIG);
     crm_trace("Triggering FSA: %s", __FUNCTION__);