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

MXS-1775 Move thread main function to maxscale::MonitorInstance

Browse Source
This commit is contained in:
Johan Wikman
2018-05-16 11:09:11 +03:00
parent 3c277f4e5e
commit 1304fd6147
12 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/galeramon/galeramon.cc
View File

@ -189,7 +189,7 @@ bool GaleraMonitor::start(const MXS_CONFIG_PARAMETER *params)
/* Reset all data in the hashtable */
reset_cluster_info();
if (thread_start(&m_thread, &GaleraMonitor::main, this, 0) == NULL)
if (thread_start(&m_thread, &maxscale::MonitorInstance::main, this, 0) == NULL)
{
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", m_monitor->name);
}
@ -503,12 +503,6 @@ void GaleraMonitor::monitorDatabase(MXS_MONITORED_SERVER *database)
*
* @param arg The handle of the monitor
*/
//static
void GaleraMonitor::main(void* arg)
{
return static_cast<GaleraMonitor*>(arg)->main();
}
void GaleraMonitor::main()
{
MXS_MONITORED_SERVER *ptr;

1
server/modules/monitor/galeramon/galeramon.hh
View File

@ -93,5 +93,4 @@ private:
void update_sst_donor_nodes(int is_cluster);
void main();
static void main(void* data);
};