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

Turn server status macros to functions

Browse Source
This commit is contained in:
Esa Korhonen
2018-07-23 15:53:10 +03:00
parent b421e56d1c
commit fbce38878b
19 changed files with 121 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/monitor.cc
View File

@ -1257,7 +1257,7 @@ bool mon_status_changed(MXS_MONITORED_SERVER* mon_srv)
bool
mon_print_fail_status(MXS_MONITORED_SERVER* mon_srv)
{
return (SERVER_IS_DOWN(mon_srv->server) && mon_srv->mon_err_count == 0);
return (server_is_down(mon_srv->server) && mon_srv->mon_err_count == 0);
}
static MXS_MONITORED_SERVER* find_parent_node(MXS_MONITORED_SERVER* servers,
@ -1715,8 +1715,8 @@ void mon_hangup_failed_servers(MXS_MONITOR *monitor)
for (MXS_MONITORED_SERVER *ptr = monitor->monitored_servers; ptr; ptr = ptr->next)
{
if (mon_status_changed(ptr) &&
(!(SERVER_IS_RUNNING(ptr->server)) ||
!(SERVER_IS_IN_CLUSTER(ptr->server))))
(!(server_is_running(ptr->server)) ||
!(server_is_in_cluster(ptr->server))))
{
dcb_hangup_foreach(ptr->server);
}
@ -2830,7 +2830,7 @@ void MonitorInstance::flush_server_status()
{
for (MXS_MONITORED_SERVER *pMs = m_monitor->monitored_servers; pMs; pMs = pMs->next)
{
if (!SERVER_IN_MAINT(pMs->server))
if (!server_is_in_maint(pMs->server))
{
pMs->server->status = pMs->pending_status;
}
@ -2851,7 +2851,7 @@ void MonitorInstanceSimple::tick()
for (MXS_MONITORED_SERVER *pMs = m_monitor->monitored_servers; pMs; pMs = pMs->next)
{
if (!SERVER_IN_MAINT(pMs->server))
if (!server_is_in_maint(pMs->server))
{
pMs->mon_prev_status = pMs->server->status;
pMs->pending_status = pMs->server->status;
@ -2909,7 +2909,7 @@ void MonitorInstanceSimple::tick()
}
#endif
if (SERVER_IS_DOWN(pMs->server))
if (server_is_down(pMs->server))
{
pMs->mon_err_count += 1;
}