Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.

only disable when transaction ID in header exists #34

Merged
merged 1 commit into from
Jan 15, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions provider/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,15 @@ module.exports = function(logger, triggerDB, redisClient) {
return trigger;
}

function shouldDisableTrigger(statusCode) {
return ((statusCode >= 400 && statusCode < 500) &&
function shouldDisableTrigger(statusCode, headers) {
return ((statusCode >= 400 && statusCode < 500) && hasTransactionIdHeader(headers) &&
[HttpStatus.REQUEST_TIMEOUT, HttpStatus.TOO_MANY_REQUESTS, HttpStatus.CONFLICT].indexOf(statusCode) === -1);
}

function hasTransactionIdHeader(headers) {
return headers && headers['x-request-id'];
}

function shouldFireTrigger(trigger) {
return trigger.monitor || self.activeHost === self.host;
}
Expand Down Expand Up @@ -268,7 +272,7 @@ module.exports = function(logger, triggerDB, redisClient) {
}
logger.error(method, 'there was an error invoking', triggerData.id, statusCode || error);

if (statusCode && shouldDisableTrigger(statusCode)) {
if (statusCode && shouldDisableTrigger(statusCode, response.headers)) {
var message;
try {
message = error.error.errorMessage;
Expand Down Expand Up @@ -332,7 +336,7 @@ module.exports = function(logger, triggerDB, redisClient) {
url: triggerURL
}, function (error, response) {
//disable trigger in database if trigger is dead
if (!error && shouldDisableTrigger(response.statusCode)) {
if (!error && shouldDisableTrigger(response.statusCode, response.headers)) {
var message = 'Automatically disabled after receiving a ' + response.statusCode + ' status code on init trigger';
disableTrigger(triggerIdentifier, response.statusCode, message);
logger.error(method, 'trigger', triggerIdentifier, 'has been disabled due to status code:', response.statusCode);
Expand Down