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

MXS-1775 Monitoring function named consistently

Browse Source 
The main monitoring function now has the same name in all
monitors (except MariaDBMonitor) and is a member function.
This commit is contained in:
Johan Wikman
2018-05-23 14:29:05 +03:00
parent af9beecaef
commit cb1da5538c
10 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,8 +145,7 @@ json_t* MMMonitor::diagnostics_json() const
* @param handle The MySQL Monitor object
* @param database The database to probe
*/
static void
monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
void MMMonitor::update_server_status(MXS_MONITORED_SERVER *database)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -163,7 +162,7 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
/** Store previous status */
database->mon_prev_status = database->server->status;
mxs_connect_result_t rval = mon_ping_or_connect_to_db(mon, database);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, database);
if (!mon_connection_is_ok(rval))
{
@ -444,7 +443,7 @@ void MMMonitor::tick()
ptr->pending_status = ptr->server->status;
/* monitor current node */
monitorDatabase(m_monitor, ptr);
update_server_status(ptr);
if (mon_status_changed(ptr) ||
mon_print_fail_status(ptr))