From 15c0e2d15d10844e88dce12d106d0bd244fcb5fa Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Mar 2018 14:14:34 +0100 Subject: [PATCH] Mariam finally running on Alpha --- .vs/AACloudPlatform/v15/.suo | Bin 77824 -> 77824 bytes Context.js | 17 +++++++++-------- Project.njsproj | 2 +- Run.js | 2 +- platform.config.json | 6 +++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index 187fc7dd42dc36f65f16acca2ecba854d4cd1425..1ba82e6640857ccb6d6b7af257c2f7d7277830e2 100644 GIT binary patch delta 4318 zcmdUydr;KZ6~}+~x4(s5SdrBQp^~uRGlDB9RS^ukf{*$Dag5Q_s95nqj36v65S2xm z#xyCyo(Mje#I8xyG!4kl@r5<3QlC+3Vq)6YX<8p0oQY&~`#sApvpzCyns&zi zW?}r-PSkT#r_3{KM{#kDrX0{&fR~T>%n6N z4nikS0XB<=oB?|K>RQObfMzS^$|RqX{Tcu`216lZfe9Fa8H9s@faAd~4g(hOG#CNc zy<{*7@SrJ>V|`_=^OuTxnol>rTZVWhp^yNE*X8!7D6OH_R8*#c=^&btwXvdra<#F> z=TTn-7J@vmn5wk>B37WZ8gTzSw--<@s>|&w=Fw5@0I?puIt_1|x#1Exq2O<8pFP4JJDq?ZKByq|pAO((9=?XXI5 zg-Uzp=)%w-2Q&tCprT0Bm3mq$IOXWVrbOx-=MW`SnwCwO8OerXs5!~_bDFbsoNT;V zdj{A|rRHqCK!iNJf&F^5(`*ne;cGR5rI7JEor^ZU~B3K0q zfq!lM((cp!6!K@F47>t<30?wg0NbvI#Aa2$F`g21e9-f%IclKnJ&*2-K?%(Mt?04m zfgWl*SV4DYv@0`F@;gqQ+3mb6)cHc9YL4s>&Z)=s-sl?cv+9X5&dU3uOjU>bsr}-= z5+s`^=s2#tZvO7YZnf0>ny9RTt{QOr&mn)|D{~|^0FJ=xJ{{Zq3gvlVBd7&+zzGPv z0U7|?@wXY}Enq9y1{wkP7x3*VtP(9xJ{GI1m7SI>YRgC>yCtVP5eH$yJpn7C+m>p1 zLzr4&>k{HTm5!>^^Kry$Db?kUQB#sW60XrQ6))+d_DQ)eoMY`;c2}bEvD2t6Iw^=# zYO;yC#!jU+b2>Rv?LqHB^*5QiCa$A0(=@%{i-_+>|FCN3B!h59n#r8FqdOfEbG*_% ze5Ni0hJyo)wLF)ky$BLtG6>l<@9-X*krnq{h9byo!8o+og5|6p3!HthC=a>p`~78! z8uKRL#|1$W-vu&NmM2kBjY9kK!pXYO&@(@3$%~*(ix8CdWnxN9{h( z|EIALf;<~-s`ZRjL)KdB4)-}hj#{g5lkLnrs=2h>`0>QhYGf?j))+Nr?^O-u{bmZ?+ij(gt><`_4LAA;Bc0xs&>LAHI5YTLVSS_5Z=d7imqOCn@rbtrqEZ13|fBQ#HlsATZQYC>}*`n ztbbf7(R~GF6J5VMio?L+qrQjsxc(pqro5p5TSS^KJtLJ!`P6o3)DwKD^DV&Fe0P4} zJ(IUAKhZoVznH??_cka-ksds^oed>geQgA-yc9z2{ljQ)eq?yjf%BVQcE56NU4`>f z_4TOn6n-LUUy#5ibDXT)pAjjJ3Nl_?_`NrnyC>PjXJp%y;hhc7sIb`CJi0zy3~g8* zB|gWzhEm*tsE6kz_CD2cFj`D@T~&ld6&F3)eNT$7g>dj$HKGXbw>-&?*Il7hjCY&` zZ@xmj<(A@&w+yuc#Ea{E7D!St|3;npmtk7^M_Uv{o!|8s?7o7BcZ}M!d8qvVu_@H1 zcS{7#Js9!ucGywz_ebmp4cUHYQFq<=Sg3ElV-)Ih&DG*xZilO;N2UAz$>HLl@Mo=c lN5w6L+$S@-v-dwvwEt$76(5bb`F!A@|Ce*!1HyO00? delta 4675 zcmds)e^is#8OL*95=jUG;WvsBlxkEGgD?R_4G?LqB0r8+-B=|;R%1~x37y&~an|Z| zwUP%#DeHPt=MS_K^0E`R+SP z0-H#+!hFgPOJk?#mQW;@qVE%cUOTNOy%0)kf*dk46bGp{JX z^I7#JQKPa^nLeN>7$_&9oB*`kf_O#f@E@Zx7t8~Nl%_~x3#mkrq~fENL$?%|Kmu)4 z#KmlZv>Na+R-k+q)L<-TqZ5j;?B{r^OPF_m5@kJ=g^H4U<0TF_vmxQ0d)(c-+&|F4X(v2jt-Purc)sq30&|& zc>;6{X}ni&noI^|q73cmYEmYt{1R^OquVv`NqtEi9aMhy9St=66&VZ0uyn35b(jUh zt8uh0Y>t94$b10?HoTmjq+4Ni>`kf-FOr9%Vfc_nSt}}1u`g;9tK+^8r4miN{u7kX zfaQP>6xc<9zN?_C1~q{1G%K(HJE#TEfuDjkfIqVh<@10q6R-aaC6-CNJ3%J63?~)- zI1GU@;DOj{2o3VY8wKg0!&}k(Z#k^+JB+6#q%bC__}DPP@Ar1dOWI0~vih17kH+y| zpAeaUc3hE0InOmb{{<$5Rf)AJ+Zk=#6DP)vxxqvscC;X>M|ZI$8__KR@JW6FYz8la zEr2`w3&0)rI}73eB&C`=TwaA}$%IQ|>Ccza#>$ES@r9%;7guaKl z!V<+q-D1WLQSIb9B~NhtXMU|*8s+@!6#)Xy3_6nZup^;H|y>coT6B2)rTQ*Yu~1>?ITe27-Yx6Bc- zuP9jXJoUCznw_0jAfEkU8grLR-DSf4O<1X5^jd{lG;H<_bI%mqcEOc+`Ww8QdPk*- z>Z-%i$SDPSo!xA++st;mWz{n_o6WU!touidbmq}iv!Yr2{h9*SxL_EwidM%~ChLGz z6=MHVe7SBmM3cv%rm7pE(ynf#XUB~kaza`DVKjB!h$mk|AuX*>C&R9zs(pBlr$~-H zA0H6+GQs_{;NBp8$P@VkW0SC>l+N!RL&XhAw6rOi{?ZgnolPOs)f6qOM%G(Nf8QHJ z=jydIxj{wFW&_P^$)k?HZJ>R>Or+)mDOB8|r<&#nPm6(h9CrqMpjn5tQR{IwD3zEc zRltPoX_h#|S-Vd#r7}(;;oCSwvYXz!YoWy_b+rG8JEwygr|I!~K6gsN?97bWY1+KZ zjC5^Uno+OKot>7e)$4Qh`Puq{f`a_?^^TlEi>;!-Qf0QybX3rZlOyu-s_nM2+}uKw z&2F}Gsi?~GoW-P_v#QckVX{|Swdhe+SX*VcXp7BOOLe8T&}4nqY%g1AGh21bs_oR) zHc4>&nwur|d}bD?tSz6mb%fHrV`r%A?*4F0vHxoX^CcF;p#8H#B*yQD`Hy|8t;6K8^*x8AEfd#8L|9u5V&}v=9jU>zqNDzG=j>HX}q`O zOc~_r^pfFl>Q@E^b+^WeXFC7Lbo@9IxZW8MjQa+|W41mw{req6Db#ix-?sK^LDYRW zc}Ns#D52x8jlBxCf_9#brl(sqjYTSUEsm!yer)E``_GjKqI264qQ0oFw&G0uhYadz zok81=FZAs3F|x0iid-2&*6Rk*@TM<_@(wx4*<^^y!8xu5xn~vrr40A~%aPE97Ondg zMjh8QqUO{U=4#HRjfd;V*X$$bMW_3;z%8Kn+Q%c)#(E7p=3}1yP8PNJEI-0Y9(Wg( zXkYgoVC3^^H1^s`OSP_~)>LJ&uU$}GU1ifPu+-ReHOJ2E+U(o%&W3fa%bU96XHfCQ zcK;B;E!iYk$5HEBMtb)X4N0#rrujF|)A4ggg>fK^0?B9xV_K12@0ZbrW0!}_=>JGw zniT&3kPt2lp6=T$*ec;)*)s9wrxzGsG;!hwml(Mn#p0!&i89iE5aEp&#(EgNYmTKw zd*i*jPmK?XJgVF?k>%(8sL_bfz onDone -> Retry Later. Requesting Execution Retry."); callBackFunction(err); return; } - break; case global.DEFAULT_FAIL_RESPONSE.result: { // This is an unexpected exception that we do not know how to handle. logger.write("[ERROR] initialize -> onDone -> Operation Failed. Aborting the process."); callBackFunction(err); return; } - break; + default: { + logger.write("[ERROR] initialize -> onDone -> Operation Failed with custom response."); + callBackFunction(err); + } } } catch (err) { @@ -191,7 +192,7 @@ if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> Entering function."); } let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor; + let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process; if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> filePath = " + filePath); } @@ -252,7 +253,7 @@ let fileName = "Execution.Context.json" let dateForPath = date.getUTCFullYear() + '/' + utilities.pad(date.getUTCMonth() + 1, 2) + '/' + utilities.pad(date.getUTCDate(), 2) + '/' + utilities.pad(date.getUTCHours(), 2) + '/' + utilities.pad(date.getUTCMinutes(), 2); - let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + dateForPath; + let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process + '/' + dateForPath; if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> filePath = " + filePath); } @@ -412,7 +413,7 @@ let fileName = "Execution.Context.json" let dateForPath = global.processDatetime.getUTCFullYear() + '/' + utilities.pad(global.processDatetime.getUTCMonth() + 1, 2) + '/' + utilities.pad(global.processDatetime.getUTCDate(), 2) + '/' + utilities.pad(global.processDatetime.getUTCHours(), 2) + '/' + utilities.pad(global.processDatetime.getUTCMinutes(), 2); - let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + dateForPath; + let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process + '/' + dateForPath; if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> filePath = " + filePath); } @@ -472,7 +473,7 @@ if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> Entering function."); } let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor; + let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process; if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> filePath = " + filePath); } @@ -547,7 +548,7 @@ if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeStatusReport -> Entering function."); } - thisObject.statusReport.lastExecution = global.processDatetime; + statusReportModule.file.lastExecution = global.processDatetime; statusReportModule.save(callBack); } diff --git a/Project.njsproj b/Project.njsproj index 85a2f27ea..a46d74930 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -13,7 +13,7 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) Project - Multi-Period-Market + Trading-Process C:\Program Files\nodejs\node.exe False diff --git a/Run.js b/Run.js index 923e3625b..ddcc3e6b0 100644 --- a/Run.js +++ b/Run.js @@ -3,7 +3,7 @@ const FULL_LOG = true; /* The following global variable tells the system if it is running on test mode or production. */ -global.RUNNING_MODE = 'Mixed'; // 'Testnet' or 'Production' +global.RUNNING_MODE = 'Production'; // 'Testnet' or 'Production' /* First thing to do is to read the config and guess which bot we will be running. */ diff --git a/platform.config.json b/platform.config.json index 9b6050224..53b059787 100644 --- a/platform.config.json +++ b/platform.config.json @@ -2,11 +2,11 @@ "codeName": "AACloud", "version": { "major": 1, - "minor": 0, - "patch": 1 + "minor": 1, + "patch": 0 }, "bot": { - "path": "../Bots/AAMasters/AAOlivia-Indicator-Bot" + "path": "../Bots/AAMasters/AAMariam-Trading-Bot" }, "stopGracefully": "false" } \ No newline at end of file