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

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

@ -406,7 +406,7 @@ void MariaDBMonitor::update_server(MariaDBServer* server)
* iteration. */
if (server->had_status(SERVER_RUNNING) || server->had_status(SERVER_MAINT))
{
mon_log_connect_error(mon_srv, conn_status);
mon_srv->log_connect_error(conn_status);
}
}
@ -657,7 +657,7 @@ void MariaDBMonitor::update_external_master()
void MariaDBMonitor::log_master_changes()
{
MXS_MONITORED_SERVER* root_master = m_master ? m_master->m_server_base : NULL;
if (root_master && mon_status_changed(root_master)
if (root_master && root_master->status_changed()
&& !(root_master->pending_status & SERVER_WAS_MASTER))
{
if ((root_master->pending_status & SERVER_MASTER) && m_master->is_running())

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

@ -991,12 +991,12 @@ void MariaDBServer::check_permissions()
void MariaDBServer::clear_status(uint64_t bits)
{
monitor_clear_pending_status(m_server_base, bits);
m_server_base->clear_pending_status(bits);
}
void MariaDBServer::set_status(uint64_t bits)
{
monitor_set_pending_status(m_server_base, bits);
m_server_base->set_pending_status(bits);
}
/**