From b91effa03fd4965b6adc6646e4882317b21d3953 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 18 Mar 2018 21:38:42 +0100 Subject: [PATCH] Months Reports need to specify the datetime at the key - Untested --- .vs/AAOlivia-Indicator-Bot/v15/.suo | Bin 32768 -> 32256 bytes Multi-Period-Daily/User.bot.js | 4 ++-- Multi-Period-Market/User.bot.js | 2 +- this.bot.config.json | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.vs/AAOlivia-Indicator-Bot/v15/.suo b/.vs/AAOlivia-Indicator-Bot/v15/.suo index 16a99eaa0753752e39629bf6b1288e61d7d4f69b..5a3b24ed8399c872e03050c6c4a539f20a411d4d 100644 GIT binary patch delta 2041 zcmdUvZA@EL7{~9q+(MDk7urH`ybczNLb)v)cD&h!wk&S)BH7#$4B)_ow^3-jwMFSo zG(=^KrBAYtWN{{D$vzCOpH0n{nD|AEF(xJ&jF}(&V4Q(C)UEzcrRWx&8nX|cn_tdz zp7Y#uo|kiuqKL{bEGbtCxn>ju6J!zG&15oM&B!!oUK`Pg`i+M8*6sH`VK!)$I*N;N zc7e9Vgr*9Ls}##yV2iY!*P_8HLJ9w^+yW^dl!7u)1kAunr=;b=Hc0KDQ@y1%u$2)h zCC(I=?%d>?9Dx2$H+h<_H#_-81=S5TFoK&IJ$eanpL4Aa;{sp+_1u}25!qCXLC&BM zvW`}?N3Cv19ees;=U>TeTchy@GcQ>8Vg;|Uux&({Twr)_;VUj#C zJ3B{_;&=Y$U*i#pXM@{Q*r>2d+BObK+T0Qq6fq?<`!JMfr)-MeEjL#1@T#Gy0kvR1 z;9=GSO4@2g(N*rT*v^@^AjC|`JC#4~g{Q{rmLyWDjH>bR@AFbMVK%Eqls3OZk-zHfAf?Shx{zI3;(1HAIY|}`>+Lrgo2PF&*2oh~Q+L;K zVs0ze_}JG{)Q@t{3X{UPaC-fzv!bO*@Zt!`I8I(1TYiTnfr@)RU^htLb6(>cotTc% zrJjS-9hgWt!h0ns>6Q3V&DLtmq40W`dkeFdkUtDuugg{k1K!BfTSlLsve0J%tLpK2 zSV@!D<#spuU4el6u>Wvtz$;VIuTm!PsU!)$`?p{1)tQF7+lG#Z#^*yr$08GqJC`r#nH%gcsM*0?3P`s-t_~cO}~>a^c0t51Iw=Fcwsi| zm<$cmhTqGlc4Hpt>$9H5TDca5z}NQi?5L}~CRTg@^cQ^k8uPWu_!hig*ZROQ&A+Q% zs$Eex`ea6nJq9wIe4m^H3-ojQw-2M9R~}G@GwR0lD64)h7d?9ZeDGI^zlQv(qLDJ@ z$>QwyKcH}IFSidR?O(!^d(!^a0NYEVYM95 c1Pj%g@yf$P5Z7{FKghy;c6B|QV69;J077#fEDQdB5l7{lM*Weh4 zm!_qWl0)oIqDYl;fI}Zj)xe%xIqE~Ghd@;2(3>xPoT^5u)l!wxZ-@<4RhmmHWu)KE zf4=!<=F@)jjq(Ro6z-<|S&n2{At6STZ2af;_BOL>z%*fA88CABKWk2pEPnP4711hH zK$MHpYmnw*+A1_G!ez}g4MSSfs4d2^jx9S_gz5ldMsROpLM(^?{rvSD52{wAS$$|I zpz#4d!42n=je_}mcuF-+JpL4YS&ac5FvjhC?DG&7aJKO{)+1IVheZ+}u$wAzkab`o z7eL%_rlPuOKT1Y!GCS_+%?b)MZVmg1Z!iZ2iXTh+hrE>WY0 z=lO*A3rn^b+n;E4vsTY1D&)N^|4vzAW7?g3!sgLwI;4i}3zT;?b~LF4&Q=|z@RF+$ z9=I2wXQs+DkEgL3VSO`l7W^(VoOcyMszfZm_VCkpe*AvD`-3Czy{$`$o#;R)`(zpq z_bs&`9W$0Q>uzB`nhlcI$RIgSg7_V$P|jH(5vk=3Yk|QF{_wE;sys5@-gvS>9t_E$L0P^udNC9Vfz(u~O3oxc1>K*};?(Z% ztWN%r(Z2lwt*-XIsQrJ^X?;>Um+d1Q9{m*L^ai9lYW^jCqj2}-gYd$jXk~9>wjDu{ zi?B>-GDa{3MVRP30Ld{0q=~n3*@MI;7YW>VJN4(**$M*G<%Wj-(#Ks17ErT#uiHe6 z#q8FkI$4XF)z9BkxYUc;9&vF0X>d}|25*MMWeKZJnM%S^qyfr2C9L4oh3N$f!i)u; uzjnvZrU0kg^2!z*?97Y5NNoRzOz( diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index 83e227fd2..e2c29befd 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -118,7 +118,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for contextVariables.firstTradeFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); - reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1"; + reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + bot.processDatetime.getUTCFullYear() + "-" + utilities.pad(bot.processDatetime.getUTCMonth(),2); thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { @@ -622,7 +622,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for let reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; let thisReport = dependencies.statusReports.get(reportKey); - thisReport.file.lastExecution = global.processDatetime; + thisReport.file.lastExecution = bot.processDatetime; thisReport.file.lastFile = lastFileDate; thisReport.save(callBack); diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index b89950662..22445fd8a 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -118,7 +118,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark contextVariables.firstTradeFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); - reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1"; + reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + bot.processDatetime.getUTCFullYear() + "-" + utilities.pad(bot.processDatetime.getUTCMonth(),2); thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { diff --git a/this.bot.config.json b/this.bot.config.json index 861415ff7..4a2418fa5 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -28,8 +28,9 @@ "run": "true" } }, - "executionWaitTime": 3600000, + "normalWaitTime": 60000, "retryWaitTime": 10000, + "sleepWaitTime": 3600000, "dependencies": [ { "devTeam": "AAMasters", @@ -82,8 +83,9 @@ "run": "true" } }, - "executionWaitTime": 60000, + "normalWaitTime": 60000, "retryWaitTime": 10000, + "sleepWaitTime": 3600000, "dependencies": [ { "devTeam": "AAMasters",