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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-19 13:28:58 +03:00
parent 52b7c23998 3d8475f8ed
commit aeebf941f6
7 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/core/misc.cc
View File

@ -20,6 +20,7 @@
#include "internal/maxscale.hh"
#include "internal/service.hh"
#include "internal/admin.hh"
static time_t started;
@ -51,12 +52,18 @@ int maxscale_shutdown()
if (n == 0)
{
if (mxs::MainWorker::created())
{
mxs::MainWorker::get().shutdown();
}
auto func = []() {
if (mxs::MainWorker::created())
{
mxs::MainWorker::get().shutdown();
}
mxs::RoutingWorker::shutdown_all();
mxs_admin_shutdown();
mxs::RoutingWorker::shutdown_all();
};
auto w = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
w->execute(func, nullptr, mxs::RoutingWorker::EXECUTE_QUEUED);
}
return n + 1;