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

MXS-2218 Treat all routing workers the same way

Browse Source 
All routing workers are now started an stopped the same way.
This commit is contained in:
Johan Wikman
2019-01-07 16:23:38 +02:00
parent 35dfa05767
commit d50ae1fb8a
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/core/gateway.cc
View File

@ -2231,7 +2231,7 @@ int main(int argc, char** argv)
/*<
* Start the routing workers running in their own thread.
*/
if (!RoutingWorker::start_threaded_workers())
if (!RoutingWorker::start_workers())
{
const char* logerr = "Failed to start routing workers.";
print_log_n_stderr(true, true, logerr, logerr, 0);
@ -2279,8 +2279,6 @@ int main(int argc, char** argv)
goto return_main;
}
worker->start();
main_worker->run();
/** Stop administrative interface */
@ -2297,11 +2295,10 @@ int main(int argc, char** argv)
*/
hkfinish();
worker->join();
/*<
* Wait for worker threads to exit.
*/
RoutingWorker::join_threaded_workers();
RoutingWorker::join_workers();
MXS_NOTICE("All workers have shut down.");