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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-11-07 14:34:25 +01:00
parent 651399b648 c13679e33d
commit 7618d03a10
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arangod/Aql/RestAqlHandler.cpp
View File

@ -424,12 +424,14 @@ void RestAqlHandler::useQuery (std::string const& operation,
try { try {
handleUseQuery(operation, query, queryJson); handleUseQuery(operation, query, queryJson);
try { if (_qId != 0) {
_queryRegistry->close(_vocbase, _qId); try {
} _queryRegistry->close(_vocbase, _qId);
catch (...) { }
// ignore errors on unregistering catch (...) {
// an error might occur if "shutdown" is called // ignore errors on unregistering
// an error might occur if "shutdown" is called
}
} }
} }
catch (triagens::arango::Exception const& ex) { catch (triagens::arango::Exception const& ex) {
@ -853,6 +855,7 @@ void RestAqlHandler::handleUseQuery (std::string const& operation,
// delete the query from the registry // delete the query from the registry
_queryRegistry->destroy(_vocbase, _qId, errorCode); _queryRegistry->destroy(_vocbase, _qId, errorCode);
_qId = 0;
} }
catch (...) { catch (...) {
LOG_ERROR("shutdown lead to an exception"); LOG_ERROR("shutdown lead to an exception");

15
js/apps/system/aardvark/frontend/js/lib/jsoneditor-min.js vendored
View File

File diff suppressed because one or more lines are too long

1
js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
View File

@ -77,6 +77,7 @@
<% if(isSystem) { %> <% if(isSystem) { %>
<option value="#logs">Logs</option> <option value="#logs">Logs</option>
<option value="#databases">Databases</option>
<% } %> <% } %>