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

MXS-2271 Continue monitor header cleanup

Browse Source 
No more free functions. Local functions moved to anonymous namespace.
This commit is contained in:
Esa Korhonen
2019-03-11 10:27:06 +02:00
parent 667a9f1c6f
commit 5e3f837b42
8 changed files with 399 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/clustrixmon/clustrix.cc
View File

@ -209,9 +209,9 @@ bool Clustrix::ping_or_connect_to_hub(const char* zName,
MYSQL** ppCon)
{
bool connected = false;
mxs_connect_result_t rv = mon_ping_or_connect_to_db(settings, server, ppCon);
mxs_connect_result_t rv = Monitor::ping_or_connect_to_db(settings, server, ppCon);
if (mon_connection_is_ok(rv))
if (Monitor::connection_is_ok(rv))
{
if (Clustrix::is_part_of_the_quorum(zName, server, *ppCon))
{

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

@ -338,7 +338,7 @@ void MariaDBMonitor::update_server(MariaDBServer* server)
mxs_connect_result_t conn_status = mon_srv->ping_or_connect(m_settings.conn_settings);
MYSQL* conn = mon_srv->con; // mon_ping_or_connect_to_db() may have reallocated the MYSQL struct.
if (mon_connection_is_ok(conn_status))
if (connection_is_ok(conn_status))
{
server->set_status(SERVER_RUNNING);
if (conn_status == MONITOR_CONN_NEWCONN_OK)