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

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

@ -125,7 +125,7 @@ static bool is_slave(MXS_MONITORED_SERVER* server)
return rval;
}
static void update_server_status(MXS_MONITOR* monitor, MXS_MONITORED_SERVER* server)
void GRMon::update_server_status(MXS_MONITORED_SERVER* server)
{
/* Don't even probe server flagged as in maintenance */
if (SERVER_IN_MAINT(server->server))
@ -136,7 +136,7 @@ static void update_server_status(MXS_MONITOR* monitor, MXS_MONITORED_SERVER* ser
/** Store previous status */
server->mon_prev_status = server->server->status;
mxs_connect_result_t rval = mon_ping_or_connect_to_db(monitor, server);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, server);
if (!mon_connection_is_ok(rval))
{
@ -185,7 +185,7 @@ void GRMon::tick()
{
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
update_server_status(ptr);
}
}

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

@ -35,6 +35,8 @@ private:
GRMon(MXS_MONITOR* monitor);
~GRMon();
void update_server_status(MXS_MONITORED_SERVER* server);
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();