hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1775 Monitor stopping moved to maxscale::MonitorInstance

Browse Source
This commit is contained in:
Johan Wikman
2018-05-16 11:20:50 +03:00
parent 1304fd6147
commit bcb7d09a15
12 changed files with 15 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/monitor/auroramon/auroramon.cc
View File

@ -219,24 +219,6 @@ bool AuroraMonitor::start(const MXS_CONFIG_PARAMETER *params)
return started;
}
/**
* Stop a running monitor
*
* @param arg Handle on thr running monior
*/
void AuroraMonitor::stop()
{
ss_dassert(m_thread);
m_shutdown = true;
thread_wait(m_thread);
m_thread = 0;
m_shutdown = false;
MXS_FREE(m_script);
m_script = NULL;
}
/**
* Diagnostic interface
*

1
server/modules/monitor/auroramon/auroramon.hh
View File

@ -29,7 +29,6 @@ public:
static AuroraMonitor* create(MXS_MONITOR* monitor);
void destroy();
bool start(const MXS_CONFIG_PARAMETER* param);
void stop();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;