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

MXS-2271 Move free monitor functions into classes

Browse Source 
Functions are divided to MonitorManager, Monitor, or the monitored
server.
This commit is contained in:
Esa Korhonen
2019-03-06 14:41:06 +02:00
parent 40f24aaaee
commit a8949b2560
13 changed files with 138 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/monitor/grmon/grmon.cc
View File

@ -74,7 +74,7 @@ static bool is_master(MXS_MONITORED_SERVER* server)
}
else
{
mon_report_query_error(server);
server->mon_report_query_error();
}
return rval;
@ -101,7 +101,7 @@ static bool is_slave(MXS_MONITORED_SERVER* server)
}
else
{
mon_report_query_error(server);
server->mon_report_query_error();
}
return rval;
@ -111,18 +111,18 @@ void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
{
if (is_master(monitored_server))
{
monitor_set_pending_status(monitored_server, SERVER_MASTER);
monitor_clear_pending_status(monitored_server, SERVER_SLAVE);
monitored_server->set_pending_status(SERVER_MASTER);
monitored_server->clear_pending_status(SERVER_SLAVE);
}
else if (is_slave(monitored_server))
{
monitor_set_pending_status(monitored_server, SERVER_SLAVE);
monitor_clear_pending_status(monitored_server, SERVER_MASTER);
monitored_server->set_pending_status(SERVER_SLAVE);
monitored_server->clear_pending_status(SERVER_MASTER);
}
else
{
monitor_clear_pending_status(monitored_server, SERVER_SLAVE);
monitor_clear_pending_status(monitored_server, SERVER_MASTER);
monitored_server->clear_pending_status(SERVER_SLAVE);
monitored_server->clear_pending_status(SERVER_MASTER);
}
}