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

MXS-1775 Rename MariaDBMonitor::main_loop() to main()

Browse Source 
To make it compatible with mxs::MonitorInstance.
This commit is contained in:
Johan Wikman
2018-05-28 14:12:06 +03:00
parent a82c5911e5
commit be3bdc7bc9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ json_t* MariaDBMonitor::diagnostics_json() const
return rval; return rval;
} }
void MariaDBMonitor::main_loop() void MariaDBMonitor::main()
{ {
m_state = MXS_MONITOR_RUNNING; m_state = MXS_MONITOR_RUNNING;
MariaDBServer* root_master = NULL; MariaDBServer* root_master = NULL;
@ -674,7 +674,7 @@ void MariaDBMonitor::handle_auto_rejoin()
static void monitorMain(void *arg) static void monitorMain(void *arg)
{ {
MariaDBMonitor* handle = static_cast<MariaDBMonitor*>(arg); MariaDBMonitor* handle = static_cast<MariaDBMonitor*>(arg);
handle->main_loop(); handle->main();
} }
/** /**

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

@ -87,7 +87,7 @@ public:
/** /**
* Runs the main monitor loop. Called from the static monitorMain()-function. * Runs the main monitor loop. Called from the static monitorMain()-function.
*/ */
void main_loop(); void main();
/** /**
* Create the monitor instance and return the instance data. * Create the monitor instance and return the instance data.