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

nicer error messages

This commit is contained in:
Frank Celler 2013-01-10 09:19:40 +01:00
parent 627e377a70
commit 8ec82daba0
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/Makefile.files
View File

@ -12,6 +12,7 @@ JAVASCRIPT_JSLINT = \
@srcdir@/html/admin/js/arangodb/browser.js \ @srcdir@/html/admin/js/arangodb/browser.js \
@srcdir@/js/actions/system/api-collection.js \ @srcdir@/js/actions/system/api-collection.js \
@srcdir@/js/actions/system/api-structure.js \ @srcdir@/js/actions/system/api-structure.js \
@srcdir@/js/actions/system/api-system.js \
@srcdir@/js/client/modules/org/arangodb.js \ @srcdir@/js/client/modules/org/arangodb.js \
@srcdir@/js/client/modules/org/arangodb/deploy.js \ @srcdir@/js/client/modules/org/arangodb/deploy.js \
@srcdir@/js/common/bootstrap/errors.js \ @srcdir@/js/common/bootstrap/errors.js \

4
js/actions/system/api-system.js
View File

@ -102,7 +102,9 @@ function Routing (req, res) {
func(req, res, action.route.callback.options, next); func(req, res, action.route.callback.options, next);
} }
catch (err) { catch (err) {
actions.errorFunction(action.route, 'A runtime error occurred while executing an action: ' + String(err))(req, res, action.route.callback.options, next); var msg = 'A runtime error occurred while executing an action: ' + String(err) + " " + String(err.stack);
actions.errorFunction(action.route, msg)(req, res, action.route.callback.options, next);
} }
}; };

8
js/server/modules/org/arangodb/actions.js
View File

@ -1396,6 +1396,14 @@ function resultException (req, res, err, headers) {
var msg = err.errorMessage; var msg = err.errorMessage;
var code = exports.HTTP_BAD; var code = exports.HTTP_BAD;
if (num === 0) {
num = arangodb.ERROR_INTERNAL;
}
if (msg === "") {
msg = String(err) + " " + String(err.stack);
}
switch (num) { switch (num) {
case arangodb.ERROR_INTERNAL: code = exports.HTTP_SERVER_ERROR; break; case arangodb.ERROR_INTERNAL: code = exports.HTTP_SERVER_ERROR; break;
} }