Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Catch exceptions in noexcept methods (#10483)

This commit is contained in:
Tobias Gödderz 2019-11-20 17:05:05 +01:00 committed by Michael Hackstein
parent 8e13486687
commit 618ffec7cb
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arangod/Aql/RestAqlHandler.cpp
View File

@ -575,13 +575,25 @@ RestStatus RestAqlHandler::continueExecute() {
}
void RestAqlHandler::shutdownExecute(bool isFinalized) noexcept {
if (isFinalized) {
if (_query) {
_query->sharedState()->resetWakeupHandler();
}
if (_qId != 0) {
_queryRegistry->close(&_vocbase, _qId);
try {
if (isFinalized) {
if (_query) {
_query->sharedState()->resetWakeupHandler();
}
if (_qId != 0) {
_queryRegistry->close(&_vocbase, _qId);
}
}
} catch (arangodb::basics::Exception const& ex) {
LOG_TOPIC("f73b8", INFO, Logger::FIXME)
<< "Ignoring exception during rest handler shutdown: "
<< "[" << ex.code() << "] " << ex.message();
} catch (std::exception const& ex) {
LOG_TOPIC("b7335", INFO, Logger::FIXME)
<< "Ignoring exception during rest handler shutdown: " << ex.what();
} catch (...) {
LOG_TOPIC("c4db4", INFO, Logger::FIXME)
<< "Ignoring unknown exception during rest handler shutdown.";
}
}