Cleanup monitor running state
This commit is contained in:
@ -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
|
||||
|
||||
@ -695,7 +695,7 @@ bool MariaDBMonitor::check_sql_files()
|
||||
bool MariaDBMonitor::execute_manual_command(std::function<void(void)> command, json_t** error_out)
|
||||
{
|
||||
bool rval = false;
|
||||
if (state() != MONITOR_STATE_RUNNING)
|
||||
if (!is_running())
|
||||
{
|
||||
PRINT_MXS_JSON_ERROR(error_out, "The monitor is not running, cannot execute manual command.");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user