fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit d2de9927f57e54a9c5c8db4cbba58e94b9e3adf4 2 parents 2bce543d a8cadc7a

Merge branch 'master' into release/4.6

Inline Side-by-side
Showing 2 changed files with 1 additions and 1 deletions
... ... @@ -32,6 +32,7 @@ exports.notFound = () => {
*/
exports.serverError = () => {
return (err, req, res, next) => {
logger.error(err);
if (!res.headersSent) {
if (req.xhr) {
return res.status(500).json({
... ... @@ -40,7 +41,6 @@ exports.serverError = () => {
});
}
logger.error(err);
return res.render('error/500', {
err: err,
module: 'common',
... ...
This diff could not be displayed because it is too large.