MXS-1848 Destroy all monitors at system shutdown

2018-05-07 14:03:33 +03:00
parent 44fa2a4be2
commit bf2a97812d
3 changed files with 33 additions and 13 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -2240,15 +2240,15 @@ int main(int argc, char **argv)
    ss_dassert(worker);
    worker->run();

-    /*< Stop all the monitors */
-    monitor_stop_all();
-
    /** Stop administrative interface */
    mxs_admin_shutdown();

-    /*< Stop all the monitors */
+    /*< Stop all monitors */
    monitor_stop_all();

+    /*< Destroy all monitors */
+    monitor_destroy_all();
+
    /*<
     * Wait for the housekeeper to finish.
     */