[incubator-openwhisk-package-cloudant] branch master updated: Avoid that trigger is fired too often if request to OpenWhisk is too slow. (#123)

[csantanapr]

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-cloudant.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f18fd6  Avoid that trigger is fired too often if request to OpenWhisk 
is too slow. (#123)
7f18fd6 is described below

commit 7f18fd63309e96590bacb3a4b5fd2173390b8c73
Author: Christian Bickel <git...@cbickel.de>
AuthorDate: Thu Aug 10 15:34:58 2017 +0200

    Avoid that trigger is fired too often if request to OpenWhisk is too slow. 
(#123)
---
 provider/lib/utils.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/provider/lib/utils.js b/provider/lib/utils.js
index 5c631ff..56fe02d 100644
--- a/provider/lib/utils.js
+++ b/provider/lib/utils.js
@@ -206,6 +206,11 @@ module.exports = function(
 
         return new Promise(function(resolve, reject) {
 
+            // only manage trigger fires if they are not infinite
+            if (dataTrigger.maxTriggers !== -1) {
+                dataTrigger.triggersLeft--;
+            }
+
             request({
                 method: 'post',
                 uri: uri,
@@ -218,6 +223,10 @@ module.exports = function(
                 try {
                     logger.info(method, dataTrigger.id, 'http post request, 
STATUS:', response ? response.statusCode : response);
                     if (error || response.statusCode >= 400) {
+                        // only manage trigger fires if they are not infinite
+                        if (dataTrigger.maxTriggers !== -1) {
+                            dataTrigger.triggersLeft++;
+                        }
                         logger.error(method, 'there was an error invoking', 
dataTrigger.id, response ? response.statusCode : error);
                         if (!error && 
utils.shouldDisableTrigger(response.statusCode)) {
                             //disable trigger
@@ -243,10 +252,6 @@ module.exports = function(
                             }
                         }
                     } else {
-                        // only manage trigger fires if they are not infinite
-                        if (dataTrigger.maxTriggers !== -1) {
-                            dataTrigger.triggersLeft--;
-                        }
                         logger.info(method, 'fired', dataTrigger.id, 
dataTrigger.triggersLeft, 'triggers left');
                         resolve(dataTrigger.id);
                     }

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].