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;
}

10
server/core/server.cc
View File

@ -537,7 +537,7 @@ static void cleanup_persistent_connections(const SERVER* server)
void
dprintServer(DCB *dcb, const SERVER *server)
{
if (!SERVER_IS_ACTIVE(server))
if (!server_is_active(server))
{
return;
}
@ -556,7 +556,7 @@ dprintServer(DCB *dcb, const SERVER *server)
mon_get_event_name((mxs_monitor_event_t)server->last_event));
time_t t = maxscale_started() + MXS_CLOCK_TO_SEC(server->triggered_at);
dcb_printf(dcb, "\tTriggered at: %s\n", http_to_date(t).c_str());
if (SERVER_IS_SLAVE(server) || SERVER_IS_RELAY_SERVER(server))
if (server_is_slave(server) || server_is_relay(server))
{
if (server->rlag >= 0)
{
@ -765,7 +765,7 @@ server_set_status_nolock(SERVER *server, uint64_t bit)
server->status |= bit;
/** clear error logged flag before the next failure */
if (SERVER_IS_MASTER(server))
if (server_is_master(server))
{
server->master_err_is_logged = false;
}
@ -1049,7 +1049,7 @@ serverRowCallback(RESULTSET *set, void *data)
return NULL;
}
(*rowno)++;
if (SERVER_IS_ACTIVE(server))
if (server_is_active(server))
{
row = resultset_make_row(set);
resultset_row_set(row, 0, server->name);
@ -1599,7 +1599,7 @@ json_t* server_list_to_json(const char* host)
for (SERVER* server = allServers; server; server = server->next)
{
if (SERVER_IS_ACTIVE(server))
if (server_is_active(server))
{
json_array_append_new(data, server_to_json_data(server, host));
}