From b0b22e27f64a569d4f71edf20b349f1f3d8d0210 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 9 Mar 2018 13:16:21 +0100 Subject: [PATCH] exchangeResponse.indexOf("Connection timed out") --- .vs/AACloudPlatform/v15/.suo | Bin 76800 -> 76800 bytes ExchangeAPI.js | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index 734370e2f5e2f4a7ad647e4a99d25a70e7238cb1..a22487ba6e2c30145f8dab4022d7bb7fef9fba8b 100644 GIT binary patch delta 2985 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 diff --git a/ExchangeAPI.js b/ExchangeAPI.js index e4e589732..d123c3f6d 100644 --- a/ExchangeAPI.js +++ b/ExchangeAPI.js @@ -80,10 +80,10 @@ if (FULL_LOG === true) { logger.write("[INFO] getOpenPositions -> onExchangeCallReturned -> err = " + err); } if (FULL_LOG === true) { logger.write("[INFO] getOpenPositions -> onExchangeCallReturned -> exchangeResponse = " + JSON.stringify(exchangeResponse)); } - if (err || exchangeResponse.error !== undefined) { + if (err || exchangeResponse.error !== undefined || exchangeResponse.indexOf("Connection timed out") > 0) { try { - if (err.message.indexOf("ETIMEDOUT") > 0) { + if (err.message.indexOf("ETIMEDOUT") > 0 || exchangeResponse.indexOf("Connection timed out") > 0) { logger.write("[WARN] getOpenPositions -> onExchangeCallReturned -> Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message); callBackFunction(global.DEFAULT_RETRY_RESPONSE); @@ -174,10 +174,10 @@ if (FULL_LOG === true) { logger.write("[INFO] getExecutedTrades -> onExchangeCallReturned -> err = " + err); } if (FULL_LOG === true) { logger.write("[INFO] getExecutedTrades -> onExchangeCallReturned -> exchangeResponse = " + JSON.stringify(exchangeResponse)); } - if (err || exchangeResponse.error !== undefined) { + if (err || exchangeResponse.error !== undefined || exchangeResponse.indexOf("Connection timed out") > 0) { try { - if (err.message.indexOf("ETIMEDOUT") > 0) { + if (err.message.indexOf("ETIMEDOUT") > 0 || exchangeResponse.indexOf("Connection timed out") > 0) { logger.write("[WARN] getExecutedTrades -> onExchangeCallReturned -> Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message); callBackFunction(global.DEFAULT_RETRY_RESPONSE); @@ -290,10 +290,10 @@ if (FULL_LOG === true) { logger.write("[INFO] putPosition -> onExchangeCallReturned -> err = " + err); } if (FULL_LOG === true) { logger.write("[INFO] putPosition -> onExchangeCallReturned -> exchangeResponse = " + JSON.stringify(exchangeResponse)); } - if (err || exchangeResponse.error !== undefined) { + if (err || exchangeResponse.error !== undefined || exchangeResponse.indexOf("Connection timed out") > 0) { try { - if (err.message.indexOf("ETIMEDOUT") > 0) { + if (err.message.indexOf("ETIMEDOUT") > 0 || exchangeResponse.indexOf("Connection timed out") > 0) { logger.write("[WARN] putPosition -> onExchangeCallReturned -> Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message); callBackFunction(global.DEFAULT_RETRY_RESPONSE); @@ -374,10 +374,10 @@ try { - if (err || exchangeResponse.error !== undefined) { + if (err || exchangeResponse.error !== undefined || exchangeResponse.indexOf("Connection timed out") > 0) { try { - if (err.message.indexOf("ETIMEDOUT") > 0) { + if (err.message.indexOf("ETIMEDOUT") > 0 || exchangeResponse.indexOf("Connection timed out") > 0) { logger.write("[WARN] movePosition -> onExchangeCallReturned -> Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message); callBackFunction(global.DEFAULT_RETRY_RESPONSE);