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

MXS-1775 Use same arrangement in update_server_status

Browse Source 
All monitors (but possible for MariaDBMon) now handle the
connecting to the server in the same way, that is, if the
connecting fails, then the status is updated and we return.
This commit is contained in:
Johan Wikman
2018-05-24 10:18:53 +03:00
parent df4e19eb27
commit 5196371762
5 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/monitor/grmon/grmon.cc
View File

@ -148,12 +148,12 @@ void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
{
mon_log_connect_error(monitored_server, rval);
}
return;
}
else
{
/* If we get this far then we have a working connection */
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
}
/* If we get this far then we have a working connection */
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
if (is_master(monitored_server))
{