You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/12/06 17:46:56 UTC
[incubator-openwhisk-package-cloudant] branch master updated:
update Node.js version to 8.14.0 (#188)
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 90a2722 update Node.js version to 8.14.0 (#188)
90a2722 is described below
commit 90a2722aba0d31a0348912fb616643d2750323c3
Author: Jason Peterson <ja...@us.ibm.com>
AuthorDate: Thu Dec 6 12:46:51 2018 -0500
update Node.js version to 8.14.0 (#188)
---
Dockerfile | 2 +-
provider/lib/utils.js | 23 +++++++++++++++--------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e5e8a21..9a4c6d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.12.0
+FROM node:8.14.0
# only package.json
ADD package.json /
diff --git a/provider/lib/utils.js b/provider/lib/utils.js
index 9a77999..c863d74 100644
--- a/provider/lib/utils.js
+++ b/provider/lib/utils.js
@@ -242,22 +242,29 @@ module.exports = function(logger, triggerDB, redisClient) {
json: form
}, function(error, response) {
try {
- logger.info(method, triggerData.id, 'http post request, STATUS:', response ? response.statusCode : response);
- if (error || response.statusCode >= 400) {
+ var statusCode;
+ if (!error) {
+ statusCode = response.statusCode;
+ }
+ else if (error.statusCode) {
+ statusCode = error.statusCode;
+ }
+ logger.info(method, triggerData.id, 'http post request, STATUS:', statusCode);
+ if (error || statusCode >= 400) {
// only manage trigger fires if they are not infinite
if (triggerData.maxTriggers !== -1) {
triggerData.triggersLeft++;
}
- logger.error(method, 'there was an error invoking', triggerData.id, response ? response.statusCode : error);
- if (!error && shouldDisableTrigger(response.statusCode)) {
+ logger.error(method, 'there was an error invoking', triggerData.id, statusCode || error);
+ if (!error && shouldDisableTrigger(statusCode)) {
//disable trigger
- var message = 'Automatically disabled after receiving a ' + response.statusCode + ' status code when firing the trigger';
- disableTrigger(triggerData.id, response.statusCode, message);
- reject('Disabled trigger ' + triggerData.id + ' due to status code: ' + response.statusCode);
+ var message = 'Automatically disabled after receiving a ' + statusCode + ' status code when firing the trigger';
+ disableTrigger(triggerData.id, statusCode, message);
+ reject('Disabled trigger ' + triggerData.id + ' due to status code: ' + statusCode);
}
else {
if (retryCount < retryAttempts ) {
- var timeout = response && response.statusCode === 429 && retryCount === 0 ? 60000 : 1000 * Math.pow(retryCount + 1, 2);
+ var timeout = statusCode === 429 && retryCount === 0 ? 60000 : 1000 * Math.pow(retryCount + 1, 2);
logger.info(method, 'attempting to fire trigger again', triggerData.id, 'Retry Count:', (retryCount + 1));
setTimeout(function () {
postTrigger(triggerData, form, uri, (retryCount + 1))