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 = () => { @@ -32,6 +32,7 @@ exports.notFound = () => {
32 */ 32 */
33 exports.serverError = () => { 33 exports.serverError = () => {
34 return (err, req, res, next) => { 34 return (err, req, res, next) => {
  35 + logger.error(err);
35 if (!res.headersSent) { 36 if (!res.headersSent) {
36 if (req.xhr) { 37 if (req.xhr) {
37 return res.status(500).json({ 38 return res.status(500).json({
@@ -40,7 +41,6 @@ exports.serverError = () => { @@ -40,7 +41,6 @@ exports.serverError = () => {
40 }); 41 });
41 } 42 }
42 43
43 - logger.error(err);  
44 return res.render('error/500', { 44 return res.render('error/500', {
45 err: err, 45 err: err,
46 module: 'common', 46 module: 'common',
This diff could not be displayed because it is too large.