Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/server/modules/monitor/mmmon/mmmon.c
+++ b/server/modules/monitor/mmmon/mmmon.c
@ -596,15 +596,6 @@ monitorMain(void *arg)
            /* monitor current node */
            monitorDatabase(mon, ptr);

-            if (mon_status_changed(ptr))
-            {
-                if (!(SERVER_IS_RUNNING(ptr->server)) ||
-                    !(SERVER_IS_IN_CLUSTER(ptr->server)))
-                {
-                    dcb_hangup_foreach(ptr->server);
-                }
-            }
-
            if (mon_status_changed(ptr) ||
                mon_print_fail_status(ptr))
            {
@ -676,6 +667,8 @@ monitorMain(void *arg)
            }
            ptr = ptr->next;
        }
+
+        mon_hangup_failed_servers(mon);
    }
 }