Cleanup monitor running state

2019-05-15 12:46:47 +03:00
parent 08b4c26652
commit c801789ff3
5 changed files with 52 additions and 91 deletions
--- a/server/modules/monitor/clustrixmon/clustrixmonitor.cc
+++ b/server/modules/monitor/clustrixmon/clustrixmonitor.cc
@ -208,7 +208,7 @@ bool ClustrixMonitor::configure(const MXS_CONFIG_PARAMETER* pParams)

 void ClustrixMonitor::populate_services()
 {
-    mxb_assert(state() == MONITOR_STATE_STOPPED);
+    mxb_assert(!is_running());

    // The servers that the Clustrix monitor has been configured with are
    // only used for bootstrapping and services will not be populated