MXS-1775 Rearrange for moving main loop to MonitorInstance

This is another step in the process for moving the main loop
from MariaDBMonitor to MonitorInstance.
This commit is contained in:
Johan Wikman
2018-06-05 12:47:34 +03:00
parent 5172c43e29
commit 71194d83d3
4 changed files with 46 additions and 24 deletions

View File

@ -2897,9 +2897,18 @@ void MonitorInstance::tick()
atomic_add_uint64(&m_monitor->ticks, 1);
}
void MonitorInstance::main()
void MonitorInstance::pre_loop()
{
load_server_journal(m_monitor, &m_master);
}
void MonitorInstance::post_loop()
{
}
void MonitorInstance::main()
{
pre_loop();
while (!m_shutdown)
{
@ -2929,6 +2938,8 @@ void MonitorInstance::main()
ms += MXS_MON_BASE_INTERVAL_MS;
}
}
post_loop();
}
//static