From 16851f4f6346d52c756a0120fe5f8e108873c705 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Mar 2018 12:50:34 +0100 Subject: [PATCH] Hole Fixing partially debugged --- .vs/AACloud/v15/.suo | Bin 91648 -> 89600 bytes Debug Log.js | 6 ++-- Dependencies.js | 4 +-- Extraction Bot Main Loop.js | 11 ++++++++ Indicator Bot Main Loop.js | 5 ++++ Run.js | 53 ++++++++++++++++++++++++++---------- Trading Bot Main Loop.js | 5 ++++ 7 files changed, 65 insertions(+), 19 deletions(-) diff --git a/.vs/AACloud/v15/.suo b/.vs/AACloud/v15/.suo index 45a534d977f1a8992e854ba03f865797f6bda816..30d409cfe012841c97d24dabf778f7254b52696c 100644 GIT binary patch delta 2966 zcmcJReNa@_6~N!QyoFs@z~y5>1X&Of;s%#O;}?x9tRKx7g!mE0OpKr*4w`ByYNnX5 z8gVQ}g*}nyU{t(B+O(L2eNJpMnrwnGcE%PnZ8B{#O}E%-?KG1*x-~VXZqHfX>ZZ-K z|1@{!_s)6e-goZ3=bX3qc`us0XH4BynG+O6i6d@@!(kE%5Yvb2Zvj}bK;&E8<`4JH z5Bv%|xJ8Vblc{$xf&E1V=n_fzR9t_@H_0%MAP?apLpn%)%g~cZmJl-ut6|F^X(R3< zCKC4({QNYMYYd(5A0T}`QA(r}g~TReDv?SQD@unlhm;)R9-@G7691%!XONssu%js? zzhUSVBrHBGl}r~3`WP69*FV1(N>_sJV>3im@4?pmx#Eys|kGxNm% z7ItsPRZbN(o{n20>AY)hylQTomP&%tQbjn3g@l=iriI6GT1-SVEo|eouuLP#X=x*7 z6W=CQD#|KlDJije*-G~@dHKq;u)}Ctc(I%owzV6Q^#wik>GN~Rzv`5!AHz;$fnm?YIJdyF=)X z$t9q!Bl}$s`7|39it=!b)s#a!-K*c6ogicr1>%C*9Mh|ZYOUa34MK;qeDawa1Zfwt zQk6NXtWtgJerU5@8oBx8)5nGeu6kbRblmq{h4PI1T9ffRzn!38S(gp|h3CNBNKT)K zacr4F(;g;+g2#tf+Ge+GIGgA=>GcHcJ3tP)}kFGp&Dl+irQ)kMR!p7m}_AIT1>$Sb7J}Yk@-9)T(>50+VcC4pqie2TLE`|Y(Hp+4{+nMj6neKrCk^= z_%tf`dxZSH@Hs>Ao5|rorvAAz9{js&0Bb7F%00sG;quu{sopB&V&U5rir;1o+*J$% zjwRH)JP5vihwktO!M~n|Zw$sskC3fG?iX^2kWUG@Q^=!2b_sO1PShu!`?E<(AqQ2I zb=i2dceTFtP#5q6<3sy+sC+?;Z@K#~AYT+H`tHX|hgGc8y7Y^_O3-}eP^oQBf}G^N zv?MFR(v1gj9`+5j;F=>Pa2^|b)6so0LmP90Qw@F^4r`7IsKNl5{54Q$aT?D$G5kuc zsWU#9y$C;kw@ml``XVH_6#m_d<)^Z;Tr`mXv0CYjYf&Co*3zGD8RZg&=jnk{Zouv{ zF5UIhOQwTfP_bCpvHP$U`?U}BFD^V}`8w8!-dA6NPtY~ohJog7_}Tj_Z2x52 z`G!aupo5YR?L=ii_PpJQzrS3jjU>Yfy>x6LU|*mKv;S_zH$x>D4nB{rx6Y&EBMnPO zny}&RSy&%x!Y=}qxasmyHBs^0ae)UuLwQDU2=bI{1?VsC5WU^e_A=>wbb0!DPW{-G z46t91c9I+*_*nEv>RIkI#%P#f_hQ2#?YiQM&L9L^k8THVNIqlHMHn zosG|#XuC*Cwf^a~TEIQGtoq{6Qn1HGJ4y0c#0Q(l7jd)cMxu55_V#iM9kstR zK1byGK3!Xg*f?QK|Ci#_7@3S>zr>Eu?TGDl z8b98q2BKkqN$?UA`4f$~8)e+^hY}-xAHn}`omlWjKBflkRNN(lDhNUyECI8YRsm_6 uV-|flyB|)$p@OW_?Pll%tx$zIr{}ofeCBISAmTK!0B#RDA!o1&)PDijsM@js delta 3327 zcmeH~dr(y86~OQLxV!AaqAV`3E-Nf=1jR*6)qnxq6=_B#fUmLDih^l1F;qb_fVh}6 zlUOx!PwG;WQF0S4N%NB1mPAduCQYWD+ObUAjMP*yZBtFmOKm2F#_c)FU0IVl%^&%r zf8^Ww?Rnhq`|drDd+)CAxWRYQu(vcZMv|l`;#x2mBq0G2f23vvK*n^DW?r54&z47i z`3IPVE#j1kCIzc#2KFpYN4JQ@d!u@`Cz7L#un}2=lgJ?K#AKqH$Rj?Z#RViy1aFi{ zGJ%*##1e5tF0qo}<1$Gvaf@!VFPd~W@eN`;L6^NfIF1wtkx!%(Q;6xrG$NJYg)>R! z5LRLpkxa0^n52c6LzL*gB9i60ejCYKiK)aS-N);A%n#YIqXwttc1$;<$l0V}xxsBs zBE?K>Csq^pV5gx3n($>qfxV6Fc7pRB9zL=au>hh+GyiV6jWfUaW|@C*dwAglTFBYu z5#Eq1!ZufgC0B$ck8nj;=Zdhbh&Udu2>ZDrTZvNr_zIG>L<+~{(Vbipp3Eg-8Cemw zKVOl#G%vCu+w^sdbjfSDA}l#Dt_bUuB*!X34aCkga?T(O`Xug=J9IsW12M^y=aKbI zqEPqNk>mzgs@uzTISK2{^Pw4^GUvu^(S4yJcGVIt!>af$ks6nw;SjPq^$tbIlrxQXCmtMph2U>msIO zb9S{kbh-5r-dG3Stv@6O4gY`xCTe!q1+Z=)a|dxBaX+DU)ojHFmpdmtLk1^|$FrnA zM?6owKpfGIEH8t;#fQMUY<}A7tA~E~SzZ7J8@nFLmAYys;BS`9RGc1jXgw!590)c$ ztI@M|CA!uQDXC6$j>|OzC*X#}D3q9LFmb~8t`09YOs4>3?O%6B3+1k>#_!Of-ig}q zT}J3DbWu7|dqG|nG2gh0jAtZm_->=X+GPn^!i*21ly$$BZ%l0hr8Y;XrLyAmh8|hm zj^T4gUa*=W`Zn>2<~|9gwKVC@h>4a=y0}Nl!9%@QsJDy0c9%d`ey_ZST;UD1tNC=k zJ7mS4fmwE^c3a1*pe_}Px6bN1tvMgxQgJNzwUv37D>CoqOln)b4}rQuR%Z!>#AGdb z^?RU+ylbG8|HNAOVP46u2Oj(5hJ!20KFoNmB$WEyJL7QUV7zvr+zv`*n{_zh%wKw= zOY<)jJh$Z1{!Bw?(!t7Z>&cpF*0hD0f2ulj^hXCqrVfM-d~5!pz8xH+dkEC~WwlDE zI|Xdun%Y*yXYHg&xP>^gyNNx-!^B>KA0caW4G;&I~Xu9{5vDRoRWbTygO zEkfNZ)b&DLAgey1Dne%k@p9m}UNNdeBDR;F zocu7hNP95-Og)xeEX1~J`|$a{zX9Fs@w?3s?>}gQJn)mf1`FmT;(PDh7gyI@-`uj< zRomEf&!%QP|4sq!e|yeogLGds^u4jj^c96P7SBoeVkDcwJVyLDi`boW!8BDj1_ck^)Zft1Wxb}OEn`!^)yni-MnHL9R zD%QR4vGQALbW91jNU>J1{sEz;@s|OdwDyN*OR0h1lD@S6Y&@KUq_?j7C25%Sv7BFTt&bcII*?89 z4G=|)4O}=f-QQ{i*Z=6&m~Qai>ZVUyh0<_oLIwT)anq-Q@JO@iyHX1_0PyDiuGugL z%Re<`HA#)qMtVQTN&Kr)l8TC^dS+Bq78QACdS}nB*cL5$dnjO==KHi0`oRvtsKcos zE2o!VzxFS4TO9hjH6vTo^ZB0CItF*c|3e=Z+^i2vLjM=qsGa78nyOf;#9+hZ8*s(0ser-M_RJo{s$w30o#! diff --git a/Debug Log.js b/Debug Log.js index 5720bf635..5d79870a5 100644 --- a/Debug Log.js +++ b/Debug Log.js @@ -65,7 +65,7 @@ /* We remove the folder in case it exister from before, so that all its content is gone. */ - rimraf.sync(folderToRemove); + //rimraf.sync(folderToRemove); /* We create the new one. */ @@ -137,7 +137,9 @@ } catch (err) { - console.log("Error trying to log info into a file. File: " + filePath + " Error:" + err.message); + console.log("Error trying to log info into a file."); + console.log("File: " + filePath ); + console.log("Error: " + err.message); } } diff --git a/Dependencies.js b/Dependencies.js index 3962056f6..bb746f4dd 100644 --- a/Dependencies.js +++ b/Dependencies.js @@ -8,7 +8,7 @@ let thisObject = { statusReports: new Map(), initialize: initialize, - key: [] + keys: [] }; /* @@ -125,7 +125,7 @@ key = pDependenciesConfig[i].devTeam + "-" + pDependenciesConfig[i].bot + "-" + pDependenciesConfig[i].process + "-" + pDependenciesConfig[i].dataSetVersion; } - thisObject.key.push(key); + thisObject.keys.push(key); thisObject.statusReports.set(key, statusReportModule); if (FULL_LOG === true) { logger.write("[INFO] initialize -> addReport -> Report added to Map. -> key = " + key); } diff --git a/Extraction Bot Main Loop.js b/Extraction Bot Main Loop.js index 819c5361e..69323a8bf 100644 --- a/Extraction Bot Main Loop.js +++ b/Extraction Bot Main Loop.js @@ -200,6 +200,12 @@ callBackFunction(global.DEFAULT_OK_RESPONSE); return; } + case "Too far in the future.": { + logger.write("[WARN] run -> loop -> startUserBot -> onFinished > Too far in the future. This Loop will enter in coma."); + nextWaitTime = 'Coma'; + loopControl(nextWaitTime); + return; + } default: { logger.write("[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled custom response received. -> err.message = " + err.message); callBackFunction(err); @@ -249,6 +255,11 @@ setTimeout(loop, processConfig.sleepWaitTime); } break; + case 'Coma': { + if (FULL_LOG === true) { logger.write("[INFO] run -> loopControl -> Restarting Loop in " + (processConfig.retryWaitTime / 3600000) + " hours."); } + setTimeout(loop, processConfig.comaWaitTime); + } + break; } } diff --git a/Indicator Bot Main Loop.js b/Indicator Bot Main Loop.js index cebe3fe43..13527bf7f 100644 --- a/Indicator Bot Main Loop.js +++ b/Indicator Bot Main Loop.js @@ -211,6 +211,11 @@ setTimeout(loop, processConfig.sleepWaitTime); } break; + case 'Coma': { + if (FULL_LOG === true) { logger.write("[INFO] run -> loopControl -> Restarting Loop in " + (processConfig.retryWaitTime / 3600000) + " hours."); } + setTimeout(loop, processConfig.comaWaitTime); + } + break; } } diff --git a/Run.js b/Run.js index 11924c8c1..b436e6dd0 100644 --- a/Run.js +++ b/Run.js @@ -176,8 +176,6 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { botConfig.filePathRoot = botConfig.devTeam + "/" + botConfig.codeName + "." + botConfig.version.major + "." + botConfig.version.minor + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + global.EXCHANGE_NAME + "/" + botConfig.dataSetVersion; - let botId = botConfig.devTeam + "." + botConfig.codeName + "." + botConfig.process; - if (FULL_LOG === true) { logger.write("[INFO] run -> listItem.process = " + listItem.process); } /* Now we loop throug all the configured processes at each bots configuration until we find the one we are supposed to run at this Node.js process. */ @@ -210,6 +208,10 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { year: pad(year, 4) }; + let padMonth = pad(month,2) + + let newInstanceBotConfig = JSON.parse(JSON.stringify(botConfig)); + let timeDelay = Math.random() * 10 * 1000; // We introduce a short delay so as to not overload the machine. setTimeout(startProcess, timeDelay); @@ -219,11 +221,11 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { switch (botConfig.type) { case 'Extraction': { - runExtractionBot(processConfig, month, year); + runExtractionBot(newInstanceBotConfig, processConfig, padMonth, year); break; } case 'Indicator': { - runIndicatorBot(processConfig, month, year); + runIndicatorBot(newInstanceBotConfig, processConfig, padMonth, year); break; } default: { @@ -255,11 +257,11 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { switch (botConfig.type) { case 'Extraction': { - runExtractionBot(processConfig, month, year); + runExtractionBot(botConfig, processConfig, month, year); break; } case 'Indicator': { - runIndicatorBot(processConfig, month, year); + runIndicatorBot(botConfig, processConfig, month, year); break; } default: { @@ -276,15 +278,15 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { switch (botConfig.type) { case 'Extraction': { - runExtractionBot(processConfig, month, year); + runExtractionBot(botConfig, processConfig, month, year); break; } case 'Indicator': { - runIndicatorBot(processConfig, month, year); + runIndicatorBot(botConfig, processConfig, month, year); break; } case 'Trading': { - runTradingBot(processConfig); + runTradingBot(botConfig, processConfig); break; } } @@ -301,14 +303,14 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { logger.write("[ERROR] run -> Process listed at the configuration file of AACloud not found at the configuration file of the bot. -> listItem.process = " + listItem.process); } - function runExtractionBot(pProcessConfig, pMonth, pYear) { + function runExtractionBot(pBotConfig, pProcessConfig, pMonth, pYear) { try { if (FULL_LOG === true) { logger.write("[INFO] runExtractionBot -> Entering function."); } if (FULL_LOG === true) { logger.write("[INFO] runExtractionBot -> pMonth = " + pMonth); } if (FULL_LOG === true) { logger.write("[INFO] runExtractionBot -> pYear = " + pYear); } - let extractionBotMainLoop = EXTRACTION_BOT_MAIN_LOOP_MODULE.newExtractionBotMainLoop(botConfig); + let extractionBotMainLoop = EXTRACTION_BOT_MAIN_LOOP_MODULE.newExtractionBotMainLoop(pBotConfig); extractionBotMainLoop.initialize(listItem.botPath, pProcessConfig, onInitializeReady); function onInitializeReady(err) { @@ -319,6 +321,13 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { function whenRunFinishes(err) { + let botId; + if (pYear !== undefined) { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process + "." + pYear + "." + pMonth; + } else { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process; + } + if (err.result === global.DEFAULT_OK_RESPONSE.result) { logger.write("[INFO] runExtractionBot -> onInitializeReady -> whenStartFinishes -> Bot execution finished sucessfully. :-)"); @@ -346,14 +355,14 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { } } - function runIndicatorBot(pProcessConfig, pMonth, pYear) { + function runIndicatorBot(pBotConfig, pProcessConfig, pMonth, pYear) { try { if (FULL_LOG === true) { logger.write("[INFO] runIndicatorBot -> Entering function."); } if (FULL_LOG === true) { logger.write("[INFO] runIndicatorBot -> pMonth = " + pMonth); } if (FULL_LOG === true) { logger.write("[INFO] runIndicatorBot -> pYear = " + pYear); } - let indicatorBotMainLoop = INDICATOR_BOT_MAIN_LOOP_MODULE.newIndicatorBotMainLoop(botConfig); + let indicatorBotMainLoop = INDICATOR_BOT_MAIN_LOOP_MODULE.newIndicatorBotMainLoop(pBotConfig); indicatorBotMainLoop.initialize(listItem.botPath, pProcessConfig, onInitializeReady); function onInitializeReady(err) { @@ -364,6 +373,13 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { function whenRunFinishes(err) { + let botId; + if (pYear !== undefined) { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process + "." + pYear + "." + pMonth; + } else { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process; + } + if (err.result === global.DEFAULT_OK_RESPONSE.result) { logger.write("[INFO] runIndicatorBot -> onInitializeReady -> whenStartFinishes -> Bot execution finished sucessfully. :-)"); @@ -391,12 +407,12 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { } } - function runTradingBot(pProcessConfig) { + function runTradingBot(pBotConfig, pProcessConfig) { try { if (FULL_LOG === true) { logger.write("[INFO] runTradingBot -> Entering function."); } - let tradingBotMainLoop = TRADING_BOT_MAIN_LOOP_MODULE.newTradingBotMainLoop(botConfig); + let tradingBotMainLoop = TRADING_BOT_MAIN_LOOP_MODULE.newTradingBotMainLoop(pBotConfig); tradingBotMainLoop.initialize(listItem.botPath, pProcessConfig, onInitializeReady); function onInitializeReady(err) { @@ -407,6 +423,13 @@ for (let p = 0; p < global.PLATFORM_CONFIG.executionList.length; p++) { function whenRunFinishes(err) { + let botId; + if (pYear !== undefined) { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process + "." + pYear + "." + pMonth; + } else { + botId = pBotConfig.devTeam + "." + pBotConfig.codeName + "." + pBotConfig.process; + } + if (err.result === global.DEFAULT_OK_RESPONSE.result) { logger.write("[INFO] runTradingBot -> onInitializeReady -> whenStartFinishes -> Bot execution finished sucessfully. :-)"); diff --git a/Trading Bot Main Loop.js b/Trading Bot Main Loop.js index 78b56dd6a..4c517e4bc 100644 --- a/Trading Bot Main Loop.js +++ b/Trading Bot Main Loop.js @@ -373,6 +373,11 @@ setTimeout(loop, processConfig.sleepWaitTime); } break; + case 'Coma': { + if (FULL_LOG === true) { logger.write("[INFO] run -> loopControl -> Restarting Loop in " + (processConfig.retryWaitTime / 3600000) + " hours."); } + setTimeout(loop, processConfig.comaWaitTime); + } + break; } }