From c83958a1abfe5b2759f6aa17ff9d675215a26904 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 30 Apr 2018 12:22:03 +0200 Subject: [PATCH] Error Handling Improvements --- .vs/AAWeb/v15/.suo | Bin 67072 -> 67584 bytes Files/DailyFiles.js | 190 +++++++++++++++++++++++++------------------ Files/MarketFiles.js | 67 ++++++++------- 3 files changed, 150 insertions(+), 107 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 01576ca0cbcdc3f9feef3ede87be9a06932573b1..0540a584a777a92ca63a48bf5a319675bfc4b252 100644 GIT binary patch delta 1036 zcmbVLZAep57~Xq!uim*WCi7$XF)gX43%}5;Vd^r9@FO)N3&{^e&}?XlScq;UAz@&9 z6($p^n`VL~dcc)YF%lgX6Z#hsp?~_(ABFu`^kL`DP5l>i;NiaaInRBb_dSPe9ptP- z+)yTN)GBlunJhyllgSzWY;A3^hYT3mWi~2}1KsrWq z7oiBRaV3fqOwKXr(9LNT1*~E|TgCS)wTZu3k;@2kkdzWmvO13;ldAbb0OfYX_cN|G z+7VU-QU?0MOCc4_LW=qzQzkMP88p}-q(mmLDx1N?aF{_&CxpjxE}E4XnQ5S%s#RVQ zn1PKJppa3DKvSw6MqR<_q!)A15&IR6`n44ip}JdN3WAiW52~pz>D)dn?zJjFnk+0x z2fj-elwv8F%kL&&qc;mmK#-0?>MPKUuP{M{n(7?k5@WO>wzGN=#PYB?(;^6JMy3Wg zcxlSp^v8u&!bOF|z8V!T-XdZg2leRAKaGQ*<7h+EgK)e4R3L0`Ki!Q3fc8y2)mzp< zJV3nL76e+VclRB8N=D&ME7(HDm+TGEE_P_;Rwo1XdKT%|L7EcoNUIrB{dpe z8Zg_rI5*}bjNj#c4Ug@Km)z>71uPsjNTJ(dxZ=#AX`%yo>7rEFD>hN%_&|s9Om^M9c0fql|u S3+FO%Py`rL+ltAx34a0D$Xbs8 delta 910 zcmah|?@Lor7~VPe-0kkR*(P^_KQJUeTZ71 zdy^DH?JkAFFn7d$T22KeYr3FMeTe!CEcPY(vCgsChmgAPaNhTM&-=X3d*C*=lI9?3 zwdG<}>NBWRIu;5HKalmODEKJ1PQ@{%3uZAi=1$R z?9>u=-NaAcw(CA}&~n=X}#a>QmPu zEmE`E8U{$WSs|gRMp@vL^7RFb%4R5J(1TCPPiM|mB@CquykRx%lfnYwH1DN;-K?lZ zh^31Z_;quVo)LWG1%1EXMfUN;Sy4n2#yXiSOO>eK>_QUX%e=@Wa(1V|MBo7J4S0}Z zlOuJLNaDM4Z(L5~<}TB(n=fK|&h0`_wT`KlXX&V+bRH?Y)XEhcGUd^{J^h#%|H#(s z#7JfpA$;@S&W{HX@<6m~I|ScnQty!-jgp5U^w~_!jh~Qm0V}5@#f_D#SP9@zcNb{x zbV65m0}MtT(A#cT*5gopB}`yD^*oAKUUG?D}=x`Wd?KXFnBE)^!juY0{fGKrS948%gSpUnm!B8nIcG=)zX1j-Ns*_ C*+xqM diff --git a/Files/DailyFiles.js b/Files/DailyFiles.js index 0e2dd4571..7506dc06d 100644 --- a/Files/DailyFiles.js +++ b/Files/DailyFiles.js @@ -29,128 +29,164 @@ function newDailyFiles() { function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { - if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } - if (INFO_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + try { - callBackWhenFileReceived = callBackFunction; + if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } - let exchange = ecosystem.getExchange(pProduct, pExchange); + callBackWhenFileReceived = callBackFunction; - if (exchange === undefined) { + let exchange = ecosystem.getExchange(pProduct, pExchange); - throw "Exchange not supoorted by this product of the ecosystem! - pDevTeam.codeName = " + pDevTeam.codeName + ", pBot.codeName = " + pBot.codeName + ", pProduct.codeName = " + pProduct.codeName + ", pExchange = " + pExchange; + if (exchange === undefined) { - } - - fileCloud = newFileCloud(); - fileCloud.initialize(pBot); - - /* Now we will get the daily files */ - - for (i = 0; i < dailyFilePeriods.length; i++) { - - let periodTime = dailyFilePeriods[i][0]; - let periodName = dailyFilePeriods[i][1]; - - if (pSet.validPeriods.includes(periodName) === true) { - - let fileCursor = newFileCursor(); - fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived); - - fileCursors.set(periodTime, fileCursor); - - expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + throw "Exchange not supoorted by this product of the ecosystem! - pDevTeam.codeName = " + pDevTeam.codeName + ", pBot.codeName = " + pBot.codeName + ", pProduct.codeName = " + pProduct.codeName + ", pExchange = " + pExchange; } + + fileCloud = newFileCloud(); + fileCloud.initialize(pBot); + + /* Now we will get the daily files */ + + for (i = 0; i < dailyFilePeriods.length; i++) { + + let periodTime = dailyFilePeriods[i][0]; + let periodName = dailyFilePeriods[i][1]; + + if (pSet.validPeriods.includes(periodName) === true) { + + let fileCursor = newFileCursor(); + fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived); + + fileCursors.set(periodTime, fileCursor); + + expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + + } + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err = " + err); } + callBackFunction(GLOBAL.CUSTOM_FAIL_RESPONSE); } } function onFileReceived(err) { - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Entering function."); } + try { - switch (err.result) { - case GLOBAL.DEFAULT_OK_RESPONSE.result: { + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Entering function."); } - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received OK Response."); } - break; + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received FAIL Response."); } + callBackWhenFileReceived(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received CUSTOM FAIL Response."); } + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> err.message = " + err.message); } + + callBackWhenFileReceived(err); + return; + } + + default: { + + if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received Unexpected Response."); } + callBackWhenFileReceived(err); + return; + } } - case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + filesLoaded++; + callBackWhenFileReceived(GLOBAL.DEFAULT_OK_RESPONSE, thisObject); // Note that the call back is called for every file loaded at each cursor. - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received FAIL Response."); } - callBackWhenFileReceived(GLOBAL.DEFAULT_FAIL_RESPONSE); - return; - } + } catch (err) { - case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received CUSTOM FAIL Response."); } - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> err.message = " + err.message); } - - callBackWhenFileReceived(err); - return; - } - - default: { - - if (INFO_LOG === true) { logger.write("[INFO] onFileReceived -> Received Unexpected Response."); } - callBackWhenFileReceived(err); - return; - } + if (ERROR_LOG === true) { logger.write("[ERROR] onFileReceived -> err = " + err); } + callBackWhenFileReceived(GLOBAL.CUSTOM_FAIL_RESPONSE); } - - filesLoaded++; - callBackWhenFileReceived(GLOBAL.DEFAULT_OK_RESPONSE, thisObject); // Note that the call back is called for every file loaded at each cursor. - } function getFileCursor(pPeriod) { - if (INFO_LOG === true) { logger.write("[INFO] getFileCursor -> Entering function."); } + try { - return fileCursors.get(pPeriod); + if (INFO_LOG === true) { logger.write("[INFO] getFileCursor -> Entering function."); } + return fileCursors.get(pPeriod); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] getFileCursor -> err = " + err); } + + } } function setDatetime(pDatetime) { - if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } + try { - filesLoaded = 0; - expectedFiles = 0; + if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } - fileCursors.forEach(setDatetimeToEach) + filesLoaded = 0; + expectedFiles = 0; - function setDatetimeToEach(fileCursor, key, map) { + fileCursors.forEach(setDatetimeToEach) - fileCursor.setDatetime(pDatetime, onFileReceived); - expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + function setDatetimeToEach(fileCursor, key, map) { + fileCursor.setDatetime(pDatetime, onFileReceived); + expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + + } + + if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> expectedFiles = " + expectedFiles); } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] setDatetime -> err = " + err); } + } - - if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> expectedFiles = " + expectedFiles); } - } function setTimePeriod(pTimePeriod, pDatetime) { - if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } + try { - filesLoaded = 0; - expectedFiles = 0; + if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } - fileCursors.forEach(setTimePeriodToEach) + filesLoaded = 0; + expectedFiles = 0; - function setTimePeriodToEach(fileCursor, key, map) { + fileCursors.forEach(setTimePeriodToEach) - fileCursor.setTimePeriod(pTimePeriod, pDatetime, onFileReceived); - expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + function setTimePeriodToEach(fileCursor, key, map) { + + fileCursor.setTimePeriod(pTimePeriod, pDatetime, onFileReceived); + expectedFiles = expectedFiles + fileCursor.getExpectedFiles(); + + } + + if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> expectedFiles = " + expectedFiles); } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err = " + err); } } - - if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> expectedFiles = " + expectedFiles); } - } function getExpectedFiles() { diff --git a/Files/MarketFiles.js b/Files/MarketFiles.js index 45be19298..6dbdd60b6 100644 --- a/Files/MarketFiles.js +++ b/Files/MarketFiles.js @@ -53,45 +53,52 @@ function newMarketFiles() { function onFileReceived(err, file) { - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Entering function."); } + try { - switch (err.result) { - case GLOBAL.DEFAULT_OK_RESPONSE.result: { + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Entering function."); } - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received OK Response."); } - break; + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received CUSTOM FAIL Response."); } + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } + callBackFunction(err); + return; + } } - case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + files.set(periodTime, file); - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received FAIL Response."); } - callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); - return; - } + filesLoaded++; - case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject); // Note that the callback is called for every file loaded. - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received CUSTOM FAIL Response."); } - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> err.message = " + err.message); } + } catch (err) { - callBackFunction(err); - return; - } - - default: { - - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } - callBackFunction(err); - return; - } + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> onFileReceived -> err = " + err); } + callBackFunction(GLOBAL.CUSTOM_FAIL_RESPONSE); } - - files.set(periodTime, file); - - filesLoaded++; - - callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject); // Note that the callback is called for every file loaded. - } } }