Merge branch '2.0' into develop-2.0-merge

server/modules/monitor/mysqlmon/mysql_mon.c

@@ -1210,18 +1210,6 @@ monitorMain(void *arg)
                                ptr->server->name,
                                ptr->server->port);
                 }
-                /**
-                 * Here we say: If the server's state changed
-                 * so that it isn't running or some other way
-                 * lost cluster membership, call call-back function
-                 * of every DCB for which such callback was
-                 * registered for this kind of issue (DCB_REASON_...)
-                 */
-                if (!(SERVER_IS_RUNNING(ptr->server)) ||
-                    !(SERVER_IS_IN_CLUSTER(ptr->server)))
-                {
-                    dcb_hangup_foreach(ptr->server);
-                }
             }
 
             if (mon_status_changed(ptr))
@@ -1483,6 +1471,8 @@ monitorMain(void *arg)
                 ptr = ptr->next;
             }
         }
+
+        mon_hangup_failed_servers(mon);
     } /*< while (1) */
 }