Skip to content

Commit e2e5353

Browse files
authored
Updated error message log and lastTriggeredError for webhook requests (TryGhost#10147)
closes TryGhost#10145 - Updated lastTriggeredError message in case of failure - Removed GhostError in case of request failure and added proper warning
1 parent db34297 commit e2e5353

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

core/server/services/webhooks/trigger.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,13 @@ function makeRequests(webhooksCollection, payload, options) {
4040
common.logging.warn(`Unable to destroy webhook ${webhookId}`);
4141
});
4242
}
43-
let lastTriggeredError = err.statusCode ? '' : `Failed to send request to ${targetUrl}`;
43+
let lastTriggeredError = err.statusCode ? '' : `Request failed: ${err.code || ''}`;
4444
updateWebhookTriggerData(webhookId, {
4545
last_triggered_at: triggeredAt,
4646
last_triggered_status: err.statusCode,
4747
last_triggered_error: lastTriggeredError
4848
});
49-
50-
common.logging.error(new common.errors.GhostError({
51-
err: err,
52-
context: {
53-
id: webhookId,
54-
event: event,
55-
target_url: targetUrl,
56-
payload: payload
57-
}
58-
}));
49+
common.logging.warn(`Request to ${targetUrl} failed ${err.code || ''}.`);
5950
});
6051
});
6152
}

0 commit comments

Comments
 (0)