Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/include/maxscale/monitor.h
+++ b/include/maxscale/monitor.h
@ -233,6 +233,15 @@ connect_result_t mon_connect_to_db(MONITOR* mon, MONITOR_SERVERS *database);
 void mon_log_connect_error(MONITOR_SERVERS* database, connect_result_t rval);
 void mon_log_state_change(MONITOR_SERVERS *ptr);

+/**
+ * @brief Hangup connections to failed servers
+ *
+ * Injects hangup events for DCB that are connected to servers that are down.
+ *
+ * @param monitor Monitor object
+ */
+void mon_hangup_failed_servers(MONITOR *monitor);
+
 /**
 * @brief Serialize a monitor to a file
 *