From 70258c7c56882658109ecf930982ff11caa9e381 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 10 Apr 2018 14:15:40 +0200 Subject: [PATCH] Execution Datetime introduced so that Logs dont overlap --- .vs/AACloud/v15/.suo | Bin 88064 -> 85504 bytes Debug Log.js | 41 +++++++++++++++++++++++++++++++---------- Run.js | 4 ++++ this.config.json | 10 +++++----- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/.vs/AACloud/v15/.suo b/.vs/AACloud/v15/.suo index 22daf21aa7d6ec0e0f3bc2e0b5d62a2ba03eca84..50359c045223b63930c2cd3517d246cc23d9348d 100644 GIT binary patch delta 5369 zcmd^@eNa@_6~Onr-Q`1IS(Pt=EDJ${!on`1upqh%%L*z22CRvQfM|myLSbTs<>vSg5B&{}p6F=!W>sy5cn?{pN zX7ZRH=e%>j&%O8DyU%e@>DaC8)+Y)w=~2sMlSow%cSc4=*eWNY`zqoDmHyR_jmJ-a z0Q1RWT814$2^OjhP>aJtST;38g^CnRQ(c^*L(jwF*b5(XlU zpax~7XjH^mICToWvAj(@L3#(FB4!fH2yP^uFcBfdT!Qn5lMEwpr$SqjL`tfZppoQk zk_nPNS(14qm4uyGFWCY~E+KTpou0b5iegeK32ud-GD*)TnMf=il@==LkBzc%nWyNz zMY2`nv%$^U=jd$%5k&+`DbGvt1(J9RT2!^6w=7@T-GSMi+$6h|WeQ0xkx9%Va*4-@ z0)m~*j^>A*y@_C*on1n(v-#ajlAXeGSx9gJo`~rL zPsB8WCxY!kBzYp(;XDy+>m>OsQ7FB$jVFR7uf}ZBBZwk`eb0X8`Qc@^fM_5rTx&Tg zT*&`apjo+4$5lM@xs*nFUrRJe_8gMy2wP7@G@e$fdul@`@+5Ih{)uw*RUCkxmP%)+ zU9AP`3Xw#l5!e-)+^HiaoyZ{cgn`H;W)fM1k(f+F^9+}<`VOWLc&ZG z5S-6KvWTz}^NC`jgjhf8fj8+h}`aKW~#7*iBgEyQv(H0iXezW@saVnktS-_TmpBx5cVRq#r^yV z$;}wnlo9EaENtB&>2G31Q+C)MdfQ9*)=pntGnBkED(}mrzaqVFA-Pr3e@b#6v5nYH zbQ4^64@s2tojnzkvGy4)P(Y4`JAHLO1b3FgS${MbID9KOtF*dssIokWV;P5*dq!JT znG*QG@hx4>|B+0*VGK}sVg&&Oja8uS|~|n zz@ZjLz;Y^69DyA_-u$p#QTnKu0Le)06vgD5%9*wcNOu}xOmuZ0oNH5#JU{G zFvHb73+AYY@;4NpcdpsD`|n-<`fGx7?EdADv&4h&*P($RK*)V7{3=Q>M}KsG+@ z{N504>$<@Gy5M#yJnw*j-n~&`wELgn-YGcumV-*H*n0rn9fH5?{4r&>><3ZXoebkN z_lqvfT<#DZhaGZHFI7BU2*dINq1e0sFXGj=)!e4%y-*4?LJ-?U?fX9yIP~%{+dyc< zi6`O!cOQ!%)31qbl=haCkL5IfzOzz)fBl=_QI%c>OnW;;+;zNL5V!npJ7D#JR#Kh> z3_Eif&g0cHHZ;|&#y@CYi!z3UDdX_HNC#sMm~7z<&J7n} z?_fQC@?j3V$`)xzscJjz4c|daUXV4K#<)QdD6_bHuhO|Z|J$Rm~ z9?8>v0~*{tKr{83_xtJPf_uaF+#(meJ7C%Y4!#VHdSYZiabg=L3X=s3FWIQqyx_$* z&Y8fD5HZhRa-RU8YUVXm*wozKP_buhy-wc!NA^yEVqh7fxx4Np|8vrJFSpQV~-~Ray4Yp^c(xohin`pie zZGGe*<8$QK6t8H-!RCJYZ2|C|>|E65dwWmq?IoQLZ_Ai)8f^cPJ!L`DHLw5nBzv@K zP^g(pN2nrd++}z_@bCI`8vf|w6g)Q^3;Dd)S;JFT3M2XI>VNz{;4O4eL?P77<6rS# zf6dNMy{?JDkb$Q@timH7om8?jX5;pcTe0av1RuVb@>vXCy{*R6xAjCMp1hgk+6E9Z zl|N+oAO6U}mmIzU$R#76wneYY!ST694&#d}O?yn&z~z-gl50{5Ec0CgvDXyuz5!Tk z)8aq!BGelVSr$XKakfEc+Y|%jF1w6ufdJ1{U|j zBp8t&ih&alqVWA7t(UdS9Ih84AY)>HuhiXt-^4gwtrp1XPmhI@^8YbJJZMVmPtw3y z_$CMY*0oen-0u)zeTD{mPfqC9WWqr?EOeck1y8s2DY>oE^`9b`@0zw4R8#mT34O7kPcS9)rEaZ^FPKKc!>)b| zFa9mbbs`rU`mgC=g5ppX{0X?tYkqp9 delta 4835 zcmd5<3s98T75>k^yDUqV*Ya?A$+B5>iGYA0D26N#LBR(Q48CebKqaFHxEe!ISDVHe zB@FCAe@bkltI?!wRQNN(*tDf#MqATHO|5kzP-8opDaoWJMQ1dr^qhUrbu=B)CY}5< z-+%8t_uO;OJ?GqW@3kFL*-oq4k}+axz^Qit$uDHJ}YKIVPggSzU&SfICa|tR!0U?gS1~F1OiI7KFKqw-_5DEz;1Y+^y z@y>4p=4gr&tBK4*y}w$bJxkc=8Zx$t%1nZ_y>t>@(gYcvr$!T@nXrSv0>Y_eAsQ;} z;>G}>^TX@xjxuUL+@NW>BS=;BgcWWJk>IYQc zMwm+QB`hH%wwKPxSxglc!d99^^~c?9rj@(v%e-hzXRobv)9P`PYIDp^YI)n8xjc^B z-CcSL+Uu9uwar0H^9HtPP1uoa@}C7{L_#LvetTuCCWk7yu0~dT8C9Mplrw>4dwt7^ zwt}#d``Rnf9*~CvVv5g;q|!bEHU%uuIQJp%P4@;M+rE(`XUajOTp2qgrf$%C>yeG0*WyP*%*C;DwYBzM}}t^ zXtgZS0NX<8MU_V_T0q;VUe+6?D=}|xx;OzlEY^$%tVg`cKqgh<-S1p@SVJxEa*kB~ zdd#BeRLH3TuD@o*7YU6oIW{CjuS`Mhsf$VcNIL_2GNnL zwAT-)oOzQ4%A@sKaH(K<(orOSZS!h5Ieg6Kq3_`-9VJS8<^YE+j%Jo9{fNmK4%XRA zn5bg+j>vbHs(rDu&5VcJ^k}(mlfF=Z24k^R^UGHo!4Z$_3hM1#XoyVyDD&aVRH}&_sORK;h5G_Yf{ww(JadZBJ$|Uqpo)OkY zHM^VI;VutgX>ta4Pf6>T)4cMrx>exVrgR(FPC%O88uzqM8o<8=(f0!N5p4%=N zg24ox7*o>ql59#fek~I`0*bNvh95vVC7h>La4Qn=q`mq$ft7c zIBOu)Qn2LxV4OT+be0{Tr^u=2!vU{eIXHQTkR+4|HFTS)5h{f(^e3y($0<(D%FeQ1 z`1@B`T-TQ=9p6C-^xvOe07^%l;{;tlZ)(08u>M_AelYw-Wu)dLDOd-M`0n7E|9-)F zVH2L{U=Z}9ZToYYS!hi|Q>e{;X#4;Oi{V51-LuK0hn);f$>YBQ$+L|qRcyKy6oX$%c$_*rg zfX67c7IwD&ge4q6qEldj^hPiQNzuVzrZYGH01e8*;Lpv{Pj#S|EhGJKTu+>(I#?mC zh=8fmB^}s$M*BgE^M?p&PzTenaoCGpx~%{ThC2TlBrB4_Sy6=kjMV< zYcFN^2odl|_gvp)7x{dl#`3b6s)MKO>S3ur0?gPjte5-mTVR|)D)j}E(+tYy=I_mR zaa|hJ2N{dETK^pNN%@xY%TuP$=`u?>I(SxWK1w#qmn<6Sx8JdSt*eas(p3sYy$}gw zF!AMqYlK2_m_UbLJhP#s> z>Ft@2-8+9SyiM(V%6yhmV{bw>Tu~fP1My4&jm9JQVtS`#LbpQ2PlIM@cQhnQH_Z^< zYnTIl02$I7W+;|^83_SWYAz(eHD;+my}_n-Jt?f58w*jrA%P+xOQKb-#ESG#>g5aT zT37G+u}C815}}93$KddFqjV?_s>5pNiI5~z6Reb01c6^G)$T!?qiGO7KMv#NUsd3q z(~;i>MH;XtK8X~IAjJx#h8T#&TWLzH8i~=;gOAt1FQwJeZWGLq7H5GmBv05NR9+9( zln=|)BQy#d>s?l?xUDBa91|@r!m_e7Jo#GWH#-CQX}Yv21|G*(J_@J#`NmY|oL{22 z3c~slAEE{m^`J{DeV7@~u3%OZ5j)8lKUDFnub%x>jQg`p)WtW)Gg9RwSdLwxQ!)Eh z1Fk6wrx(LiIzD&jLan0ERaqeQn?Q;CpNphdq=iPE6RMn}za2`^Qk+UTmm+nA!$zXa zCp9;?qH?dNSnLrD%VT{$#?<61JLfnB;54jjtg$nxkgK2jJ< NcYebJ5&gfc=U)h{@~8j+ diff --git a/Debug Log.js b/Debug Log.js index b50c5700b..310eb97df 100644 --- a/Debug Log.js +++ b/Debug Log.js @@ -7,6 +7,7 @@ const dateString = currentDate.getUTCFullYear() + '-' + pad(currentDate.getUTCMonth() + 1, 2) + '-' + pad(currentDate.getUTCDate(), 2) + '-' + pad(currentDate.getUTCHours(), 2) + '-' + pad(currentDate.getUTCMinutes(), 2); const randomId = parseInt(Math.random() * 1000000); + let executionPath = global.EXECUTION_DATETIME.getUTCFullYear() + '/' + pad(global.EXECUTION_DATETIME.getUTCMonth() + 1, 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCDate(), 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCHours(), 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCMinutes(), 2); let fileNumber = 1; let messageId = 0; let firstCall = true; @@ -31,19 +32,39 @@ createFolderSync(folderPath); - folderPath = '../Logs/' + thisObject.bot.devTeam; + folderPath = '../Logs/' + global.EXECUTION_DATETIME.getUTCFullYear(); createFolderSync(folderPath); - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type; + folderPath = '../Logs/' + global.EXECUTION_DATETIME.getUTCFullYear() + '/' + pad(global.EXECUTION_DATETIME.getUTCMonth() + 1, 2); createFolderSync(folderPath); - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor; + folderPath = '../Logs/' + global.EXECUTION_DATETIME.getUTCFullYear() + '/' + pad(global.EXECUTION_DATETIME.getUTCMonth() + 1, 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCDate(), 2); createFolderSync(folderPath); - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process; + folderPath = '../Logs/' + global.EXECUTION_DATETIME.getUTCFullYear() + '/' + pad(global.EXECUTION_DATETIME.getUTCMonth() + 1, 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCDate(), 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCHours(), 2); + + createFolderSync(folderPath); + + folderPath = '../Logs/' + global.EXECUTION_DATETIME.getUTCFullYear() + '/' + pad(global.EXECUTION_DATETIME.getUTCMonth() + 1, 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCDate(), 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCHours(), 2) + '/' + pad(global.EXECUTION_DATETIME.getUTCMinutes(), 2); + + createFolderSync(folderPath); + + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam; + + createFolderSync(folderPath); + + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type; + + createFolderSync(folderPath); + + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor; + + createFolderSync(folderPath); + + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process; createFolderSync(folderPath); @@ -63,11 +84,11 @@ /* When there are YEARS and MONTHS involved */ - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year; + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year; createFolderSync(folderPath); - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month; + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month; createFolderSync(folderPath); @@ -75,13 +96,13 @@ /* We create the new one. */ - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month + "/Loop." + loopCounter; + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month + "/Loop." + loopCounter; createFolderSync(folderPath); /* We also remove old folders according to the configuration value of global.PLATFORM_CONFIG.maxLogLoops. */ - let folderToRemove = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month + "/Loop." + (loopCounter - global.PLATFORM_CONFIG.maxLogLoops).toString(); + let folderToRemove = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/" + thisObject.bot.debug.year + "/" + thisObject.bot.debug.month + "/Loop." + (loopCounter - global.PLATFORM_CONFIG.maxLogLoops).toString(); deleteLoopFolder(folderToRemove); @@ -92,13 +113,13 @@ /* We create the new one. */ - folderPath = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/Loop." + loopCounter; + folderPath = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/Loop." + loopCounter; createFolderSync(folderPath); /* We also remove old folders according to the configuration value of global.PLATFORM_CONFIG.maxLogLoops. */ - let folderToRemove = '../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/Loop." + (loopCounter - global.PLATFORM_CONFIG.maxLogLoops).toString(); + let folderToRemove = '../Logs/' + executionPath + "/" + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process + "/Loop." + (loopCounter - global.PLATFORM_CONFIG.maxLogLoops).toString(); deleteLoopFolder(folderToRemove); } diff --git a/Run.js b/Run.js index b436e6dd0..106c462e4 100644 --- a/Run.js +++ b/Run.js @@ -86,6 +86,10 @@ global.MARKET = { global.EXCHANGE_NAME = "Poloniex"; +/* This is the Execution Datetime */ + +global.EXECUTION_DATETIME = new Date(); + /* Time Periods Definitions. */ global.marketFilesPeriods = diff --git a/this.config.json b/this.config.json index 8ac510194..af7433105 100644 --- a/this.config.json +++ b/this.config.json @@ -17,12 +17,12 @@ "process": "Multi-Period-Market" }, { - "enabled": "false", - "botPath": "../Bots/AAMasters/AACharly-Extraction-Bot", - "process": "Poloniex-Hole-Fixing" + "enabled": "true", + "botPath": "../Bots/AAMasters/AAOlivia-Indicator-Bot", + "process": "Multi-Period-Daily" }, { - "enabled": "true", + "enabled": "false", "botPath": "../Bots/AAMasters/AABruce-Indicator-Bot", "process": "One-Min-Daily-Candles-Volumes" }, @@ -39,6 +39,6 @@ ], "stopGracefully": "false", "exchangeSimulationMode": "false", - "storageConnStringFolder": "Mixed", + "storageConnStringFolder": "Production", "maxLogLoops": 5 } \ No newline at end of file