From commits-return-6459-archive-asf-public=cust-asf.ponee.io@openwhisk.apache.org Tue Dec 18 04:31:41 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 54521180652 for ; Tue, 18 Dec 2018 04:31:41 +0100 (CET) Received: (qmail 22607 invoked by uid 500); 18 Dec 2018 03:31:40 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 22596 invoked by uid 99); 18 Dec 2018 03:31:40 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2018 03:31:40 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BC7F585286; Tue, 18 Dec 2018 03:31:39 +0000 (UTC) Date: Tue, 18 Dec 2018 03:31:39 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk-package-alarms] branch master updated: check if we should disable trigger for status codes on error object (#173) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154510389971.6306.5552182528518602312@gitbox.apache.org> From: csantanapr@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk-package-alarms X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7693072f37d4ae215bf89bd721053b3cad341fec X-Git-Newrev: 0ee1badaedf046fe36d68e82ebc981e496b0283a X-Git-Rev: 0ee1badaedf046fe36d68e82ebc981e496b0283a X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git The following commit(s) were added to refs/heads/master by this push: new 0ee1bad check if we should disable trigger for status codes on error object (#173) 0ee1bad is described below commit 0ee1badaedf046fe36d68e82ebc981e496b0283a Author: Jason Peterson AuthorDate: Mon Dec 17 22:31:35 2018 -0500 check if we should disable trigger for status codes on error object (#173) --- provider/lib/utils.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/provider/lib/utils.js b/provider/lib/utils.js index 6dde7ef..943dbe2 100644 --- a/provider/lib/utils.js +++ b/provider/lib/utils.js @@ -113,11 +113,15 @@ module.exports = function(logger, triggerDB, redisClient) { triggerData.triggersLeft++; } - if (!error && shouldDisableTrigger(statusCode)) { - //disable trigger - var message = 'Automatically disabled after receiving a ' + statusCode + ' status code when firing the trigger'; - disableTrigger(triggerIdentifier, statusCode, message); - reject('Disabled trigger ' + triggerIdentifier + ' due to status code: ' + statusCode); + if (statusCode && shouldDisableTrigger(statusCode)) { + var message; + try { + message = error.error.errorMessage; + } catch (e) { + message = `Received a ${statusCode} status code when firing the trigger`; + } + disableTrigger(triggerIdentifier, statusCode, `Trigger automatically disabled: ${message}`); + reject(`Disabled trigger ${triggerIdentifier}: ${message}`); } else { if (retryCount < retryAttempts) {