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

Merge branch '2.1-ipv6' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-03-13 13:18:08 +02:00
parent b53ef249f9 9c325104b7
commit 147a1f88eb
17 changed files with 412 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/monitor.c
View File

@ -998,10 +998,13 @@ bool mon_status_changed(MXS_MONITOR_SERVERS* mon_srv)
unsigned int new_status = mon_srv->server->status & all_server_bits;
/**
* The state has changed if the relevant state bits are not the same and
* the server is not going into maintenance or coming out of it
* The state has changed if the relevant state bits are not the same,
* the server is either running, stopping or starting and the server is
* not going into maintenance or coming out of it
*/
if (old_status != new_status && ((old_status | new_status) & SERVER_MAINT) == 0)
if (old_status != new_status &&
((old_status | new_status) & SERVER_MAINT) == 0 &&
((old_status | new_status) & SERVER_RUNNING) == SERVER_RUNNING)
{
rval = true;
}