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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä 2020-01-02 11:22:52 +02:00
commit 9428c31bc4
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/resource.cc
View File

@ -1370,11 +1370,14 @@ HttpResponse resource_handle_request(const HttpRequest& request)
mxs::RoutingWorker* worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
HttpResponse response;
worker->call([&request, &response, worker]() {
mxs::WatchdogWorkaround workaround(worker);
response = handle_request(request);
},
mxb::Worker::EXECUTE_AUTO);
if (!worker->call([&request, &response, worker]() {
mxs::WatchdogWorkaround workaround(worker);
response = handle_request(request);
},
mxb::Worker::EXECUTE_AUTO))
{
response = HttpResponse(MHD_HTTP_SERVICE_UNAVAILABLE);
}
return response;
}