From 8ad644ec3aad4b47f7d69c70631dab83d51b566b Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 3 Apr 2020 12:24:48 +0200 Subject: [PATCH] remove comment and improve logging --- website/server/libs/webhook.js | 6 +++++- website/server/models/webhook.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/website/server/libs/webhook.js b/website/server/libs/webhook.js index 738af5b71b..c7d201e829 100644 --- a/website/server/libs/webhook.js +++ b/website/server/libs/webhook.js @@ -19,7 +19,11 @@ function sendWebhook (webhook, body, user) { // Not calling .json() to parse the response because we simply ignore it }).catch(webhookErr => { // Log the error - logger.error(webhookErr, 'Error while sending a webhook request.'); + logger.error(webhookErr, { + extraMessage: 'Error while sending a webhook request.', + userId: user._id, + webhook, + }); let _failuresReset = false; diff --git a/website/server/models/webhook.js b/website/server/models/webhook.js index f9a0f62dc7..e9d4ec12e6 100644 --- a/website/server/models/webhook.js +++ b/website/server/models/webhook.js @@ -58,7 +58,7 @@ export const schema = new Schema({ required: true, validate: [v => validator.isURL(v, { require_tld: !!IS_PRODUCTION, // eslint-disable-line camelcase - require_protocol: true, // TODO migrate existing ones + require_protocol: true, protocols: ['http', 'https'], }), shared.i18n.t('invalidUrl')], },