From 10e85d6038532a1873f6c10815f735c9e44ede5f Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 5 Mar 2020 19:07:12 +0100 Subject: [PATCH 1/2] Fix boom middleware logging < 500 errors and delete message when not necessary Signed-off-by: Alexandre Bodin --- packages/strapi/lib/middlewares/boom/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/strapi/lib/middlewares/boom/index.js b/packages/strapi/lib/middlewares/boom/index.js index edc626314c..b1657917f6 100644 --- a/packages/strapi/lib/middlewares/boom/index.js +++ b/packages/strapi/lib/middlewares/boom/index.js @@ -80,9 +80,13 @@ module.exports = strapi => { } // Log error. - strapi.log.error(error); const { status, body } = formatBoomPayload(error); + + if (status >= 500) { + strapi.log.error(error); + } + ctx.body = body; ctx.status = status; } @@ -107,7 +111,7 @@ module.exports = strapi => { const { status, body } = formatBoomPayload(boomError); // keep retro-compatibility for old error formats - body.message = body.data; + body.message = body.message || body.data; this.body = body; this.status = status; From 50eb322d2d351bc9c4818d6cb5c852b123fe13bd Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 5 Mar 2020 20:17:07 +0100 Subject: [PATCH 2/2] Add message when necessary Signed-off-by: Alexandre Bodin --- packages/strapi/lib/middlewares/boom/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/strapi/lib/middlewares/boom/index.js b/packages/strapi/lib/middlewares/boom/index.js index b1657917f6..99fe78d990 100644 --- a/packages/strapi/lib/middlewares/boom/index.js +++ b/packages/strapi/lib/middlewares/boom/index.js @@ -105,13 +105,13 @@ module.exports = strapi => { // Custom function to avoid ctx.body repeat createResponses() { boomMethods.forEach(method => { - strapi.app.response[method] = function(...rest) { - const boomError = Boom[method](...rest) || {}; + strapi.app.response[method] = function(msg, ...rest) { + const boomError = Boom[method](msg, ...rest) || {}; const { status, body } = formatBoomPayload(boomError); // keep retro-compatibility for old error formats - body.message = body.message || body.data; + body.message = msg || body.data || body.message; this.body = body; this.status = status;