Skip to content

Toggle error view stack trace based on minLogLevel #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianparry merged 1 commit into from
Aug 10, 2016
Merged

Toggle error view stack trace based on minLogLevel #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions data/views/error.2.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"message": "<%=message%>",
"status": "<%=status%>",
"stack": "<%=stack%>"
"status": "<%=status%>"
<% if (hasOwnProperty("stack")) { %>
,"stack": [
<% stack.forEach(function ( item, i, arr){ %>
"<%=item %>"
<%= ( arr.length > 0 && i < arr.length-1 ) ? ',': '' %>
<% }); %>
]
<% } %>
}
12 changes: 10 additions & 2 deletions lib/fittings/error_handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var http = require('http');
module.exports = function create() {
var injector = require('../../index.js').injector;
var swaggerService = injector.get('Http.Services.Swagger');
var conf = injector.get('Services.Configuration');
var constants = injector.get('Constants');
return function error_handler(context, next) { // jshint ignore:line
if (!util.isError(context.error)) { return next(); }

Expand All @@ -23,9 +25,15 @@ module.exports = function create() {
res.locals.errorStatus = err.status;
}

var stackDump = err.stack.replace(/\n/g, '');
message = message.replace(/\n/g, '');
res.body = {message: message, status: res.locals.errorStatus, stack: stackDump};
res.body = {message: message, status: res.locals.errorStatus};
var minLogLevel = conf.get('minLogLevel');
if (minLogLevel === constants.Logging.Levels.debug) {
if (err.stack !== undefined) {
var stackDump = err.stack.split(/\n/);
res.body.stack = stackDump;
}
}
swaggerService.renderer(context.request, context.response, 'error.2.0.json', next);

} else {
Expand Down