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

MXS-2218 Implement housekeeper in terms of MainWorker

Browse Source
This commit is contained in:
Johan Wikman
2019-01-08 10:23:16 +02:00
parent 026bf747e6
commit 6ba2cb61df
7 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/core/gateway.cc
View File

@ -2072,13 +2072,6 @@ int main(int argc, char** argv)
// Initialize the housekeeper
main_worker = new maxscale::MainWorker;
if (!hkinit())
{
const char* logerr = "Failed to initialize housekeeper";
print_log_n_stderr(true, true, logerr, logerr, 0);
rc = MAXSCALE_INTERNALERROR;
goto return_main;
}
if (!qc_setup(&cnf->qc_cache_properties, cnf->qc_sql_mode, cnf->qc_name, cnf->qc_args))
{
@ -2203,15 +2196,6 @@ int main(int argc, char** argv)
goto return_main;
}
// Start the housekeeper thread
if (!hkstart())
{
const char* logerr = "Failed to start housekeeper thread.";
print_log_n_stderr(true, true, logerr, logerr, 0);
rc = MAXSCALE_INTERNALERROR;
goto return_main;
}
/** Start all monitors */
monitor_start_all();
@ -2290,11 +2274,6 @@ int main(int argc, char** argv)
/*< Destroy all monitors */
monitor_destroy_all();
/*<
* Wait for the housekeeper to finish.
*/
hkfinish();
/*<
* Wait for worker threads to exit.
*/