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

Merge branch '2.2' of github.com:mariadb-corporation/MaxScale into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-03 14:46:14 +03:00
parent bd39284f9c 68432bbaa3
commit 27d1be7f96
12 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/auroramon/auroramon.c
View File

@ -44,7 +44,7 @@ typedef struct aurora_monitor
* @param monitor Monitor object
* @param database Server whose status should be updated
*/
void update_server_status(MXS_MONITOR *monitor, MXS_MONITOR_SERVERS *database)
void update_server_status(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *database)
{
if (!SERVER_IN_MAINT(database->server))
{
@ -126,7 +126,7 @@ monitorMain(void *arg)
lock_monitor_servers(monitor);
servers_status_pending_to_current(monitor);
for (MXS_MONITOR_SERVERS *ptr = monitor->databases; ptr; ptr = ptr->next)
for (MXS_MONITORED_SERVER *ptr = monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(monitor, ptr);