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

MXS-1775 Preparatory work for moving main loop to MonitorInstance

Browse Source
This commit is contained in:
Johan Wikman
2018-05-16 14:58:01 +03:00
parent 6db4ce54a9
commit 6fff5a4f23
4 changed files with 32 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,18 +246,12 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
*/
void NDBCMonitor::main()
{
MXS_MONITORED_SERVER *ptr;
size_t nrounds = 0;
load_server_journal(m_monitor, NULL);
while (1)
while (!m_shutdown)
{
if (m_shutdown)
{
return;
}
/** Wait base interval */
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
/**
@ -278,7 +272,7 @@ void NDBCMonitor::main()
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
ptr = m_monitor->monitored_servers;
MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers;
while (ptr)
{
ptr->mon_prev_status = ptr->server->status;