mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-15 05:37:22 +01:00
feat(logging): improve logging removing not useful data and distinguishing between user and server errors
This commit is contained in:
@@ -2,6 +2,9 @@
|
|||||||
import winston from 'winston';
|
import winston from 'winston';
|
||||||
import nconf from 'nconf';
|
import nconf from 'nconf';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
import {
|
||||||
|
CustomError,
|
||||||
|
} from './errors';
|
||||||
|
|
||||||
const IS_PROD = nconf.get('IS_PROD');
|
const IS_PROD = nconf.get('IS_PROD');
|
||||||
const IS_TEST = nconf.get('IS_TEST');
|
const IS_TEST = nconf.get('IS_TEST');
|
||||||
@@ -42,8 +45,27 @@ let loggerInterface = {
|
|||||||
// pass the error stack as the first parameter to logger.error
|
// pass the error stack as the first parameter to logger.error
|
||||||
let stack = err.stack || err.message || err;
|
let stack = err.stack || err.message || err;
|
||||||
|
|
||||||
if (_.isPlainObject(errorData) && !errorData.fullError) errorData.fullError = err;
|
if (_.isPlainObject(errorData) && !errorData.fullError) {
|
||||||
logger.error(stack, errorData, ...otherArgs);
|
// If the error object has interesting data (not only httpCode, message and name from the CustomError class)
|
||||||
|
// add it to the logs
|
||||||
|
if (err instanceof CustomError) {
|
||||||
|
let errWithoutCommonProps = _.omit(err, ['name', 'httpCode', 'message']);
|
||||||
|
|
||||||
|
if (Object.keys(errWithoutCommonProps).length > 0) {
|
||||||
|
errorData.fullError = errWithoutCommonProps;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
errorData.fullError = err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let loggerArgs = [stack, errorData, ...otherArgs];
|
||||||
|
// Treat 4xx errors as warnings, 5xx and uncaught errors as serious problems
|
||||||
|
if (!errorData || !errorData.statusCode || errorData.statusCode > 499) {
|
||||||
|
logger.error(...loggerArgs);
|
||||||
|
} else {
|
||||||
|
logger.warn(stack, errorData, ...otherArgs);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.error(...args);
|
logger.error(...args);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,12 +12,6 @@ import {
|
|||||||
} from 'lodash';
|
} from 'lodash';
|
||||||
|
|
||||||
module.exports = function errorHandler (err, req, res, next) { // eslint-disable-line no-unused-vars
|
module.exports = function errorHandler (err, req, res, next) { // eslint-disable-line no-unused-vars
|
||||||
logger.error(err, {
|
|
||||||
originalUrl: req.originalUrl,
|
|
||||||
headers: omit(req.headers, ['x-api-key']),
|
|
||||||
body: req.body,
|
|
||||||
});
|
|
||||||
|
|
||||||
// In case of a CustomError class, use it's data
|
// In case of a CustomError class, use it's data
|
||||||
// Otherwise try to identify the type of error (mongoose validation, mongodb unique, ...)
|
// Otherwise try to identify the type of error (mongoose validation, mongodb unique, ...)
|
||||||
// If we can't identify it, respond with a generic 500 error
|
// If we can't identify it, respond with a generic 500 error
|
||||||
@@ -70,6 +64,14 @@ module.exports = function errorHandler (err, req, res, next) { // eslint-disable
|
|||||||
responseErr = new InternalServerError();
|
responseErr = new InternalServerError();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// log the error
|
||||||
|
logger.error(err, {
|
||||||
|
originalUrl: req.originalUrl,
|
||||||
|
headers: omit(req.headers, ['x-api-key', 'cookie']), // don't send sensitive information that only adds noise
|
||||||
|
body: req.body,
|
||||||
|
statusCode: responseErr.httpCode,
|
||||||
|
});
|
||||||
|
|
||||||
let jsonRes = {
|
let jsonRes = {
|
||||||
success: false,
|
success: false,
|
||||||
error: responseErr.name,
|
error: responseErr.name,
|
||||||
|
|||||||
Reference in New Issue
Block a user