MXS-2271 Store monitored servers in a vector

The array is still a public member because it's used in several non-member functions.
2019-01-24 12:43:27 +02:00
parent 9083ea2d02
commit cef4e836bc
7 changed files with 81 additions and 148 deletions
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -1422,9 +1422,9 @@ bool runtime_destroy_monitor(Monitor* monitor)
    {
        monitor_stop(monitor);

-        while (monitor->monitored_servers)
+        while (!monitor->m_servers.empty())
        {
-            monitor_remove_server(monitor, monitor->monitored_servers->server);
+            monitor_remove_server(monitor, monitor->m_servers[0]->server);
        }
        monitor_deactivate(monitor);
        MXS_NOTICE("Destroyed monitor '%s'", monitor->name);