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

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

@ -321,7 +321,7 @@ void MMMonitor::post_tick()
for(MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
if (!SERVER_IN_MAINT(ptr->server))
if (!server_is_in_maint(ptr->server))
{
/* If "detect_stale_master" option is On, let's use the previus master */
if (m_detectStaleMaster && root_master &&
@ -369,7 +369,7 @@ MXS_MONITORED_SERVER *MMMonitor::get_current_master()
* that means SERVER_IS_RUNNING returns 0
* Let's check only for SERVER_IS_DOWN: server is not running
*/
if (SERVER_IS_DOWN(ptr->server))
if (server_is_down(ptr->server))
{
ptr = ptr->next;
continue;
@ -391,7 +391,7 @@ MXS_MONITORED_SERVER *MMMonitor::get_current_master()
if (m_master != NULL)
{
/* If the root master is in MAINT, return NULL */
if (SERVER_IN_MAINT(m_master->server))
if (server_is_in_maint(m_master->server))
{
return NULL;
}