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

MXS-2271 Rename monitor-related classes

Browse Source 
MXS_MONITOR->Monitor
MonitorInstance->MonitorWorker
MonitorInstanceSimple->MonitorWorkerSimple
This commit is contained in:
Esa Korhonen
2019-01-21 16:08:23 +02:00
parent 465f9f16c4
commit 9ac8bf93bb
22 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/mmmon/mmmon.cc
View File

@ -56,7 +56,7 @@ void MMMonitor::diagnostics(DCB* dcb) const
json_t* MMMonitor::diagnostics_json() const
{
json_t* rval = MonitorInstance::diagnostics_json();
json_t* rval = MonitorWorker::diagnostics_json();
json_object_set_new(rval, "detect_stale_master", json_boolean(m_detectStaleMaster));
return rval;
}
@ -363,7 +363,7 @@ void MMMonitor::post_tick()
MXS_MONITORED_SERVER* MMMonitor::get_current_master()
{
MXS_MONITOR* mon = m_monitor;
Monitor* mon = m_monitor;
MXS_MONITORED_SERVER* ptr;
ptr = mon->monitored_servers;

2
server/modules/monitor/mmmon/mmmon.hh
View File

@ -19,7 +19,7 @@
* @file mmmon.hh - The Multi-Master monitor
*/
class MMMonitor : public maxscale::MonitorInstanceSimple
class MMMonitor : public maxscale::MonitorWorkerSimple
{
public:
MMMonitor(const MMMonitor&) = delete;