From fab5926309f3feea684c39e150ad9275b0b5e01a Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 10 Mar 2018 18:23:15 +0100 Subject: [PATCH] Configuration Upgrade --- .vs/AACloudPlatform/v15/.suo | Bin 75776 -> 76288 bytes Context.js | 12 ++++++------ Debug Log.js | 4 ++-- Project.njsproj | 2 +- Run.js | 13 ++++++------- Trading Bot Main Loop.js | 5 ++--- this.vm.config.json => platform.config.json | 6 ++++++ 7 files changed, 23 insertions(+), 19 deletions(-) rename this.vm.config.json => platform.config.json (50%) diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index 403f0e921346276673503e0c18d776a0d5ebc454..ddf647c795bd3cb231caa9435ab5d5c9f7bafbae 100644 GIT binary patch delta 1976 zcmds1eQZ-z6o2RSb$xHPjon8bY-$^;lZ}mzmC=om0jp*>;wa)0lSx+R3YxKYV;{!N z@e(k6M1$=~C{D@dW2;0HxAj(uF=|OLnNh-&!9OF*i2Pw93`7!f5$3tIEKSru(8L&T z^XobHcYpWXb9+v&Iw`4B(%2>u3}_c0)K7jmwHC2mJc}Mf9Ax}OcMRG>-uo~v{i^H~ z1mX6=!a^5*tj|{hG}}Yy3wg8gn!XV?i8g&x$Xi1DGtSB;S}G;r(1Z=0q7h%xsXU+| z|NdN}Da_(1NX>0z6^gc8A}23Ja+Q(%dkFmSrDO{U4-;@r~pqqorWHg)`M&zo+oxkjyEh* zY$C@E;hYIJkww<(k@+#^G!g4`zXn>K7`E0*hBO{Kt!J>N^3zzsO-a0HW%ITSomL=) z^K8ua=&UaM$jv)!Xse64oR@*~fF1o=EXy?qT9Fv8Sf_+2B)??$xOWsnK{;0C&d5a~ zlh;jsb#oE(R&a$B+i>+Uknq~Rz0i-as=*W#S_PlbDfoqe(1F$S`S|1hr*Z4H<>6){ z2zc^9HA@_5HD|X7K~n4z8ifsHJGqDUJ*!#wk%N$VkqVGa$7BjPHZTl_aeSZ@RklXA zrK=6Sv0~gl7$vOW+?rskuhSps*jd^fX!F0Yz4XOhfwsQB-b$yh;<<9)>XPO%UwMhk z>8vdAt#rFfT2}h~?#heFV?qS@`6! zOO}n0QjlpO-;2KKZrnCvj65sDLsEr zHfe?I%<(e7LqC|cF)?CMz-8T=wr`Mp-q)THe%tU*CU*XVBEWmEoAKn)B32atLVwo< z{p7z{(9ALLR5|I>yIz|Vv3+m{{`2Tl7*&Yx|r=G~Y3 zmn(+U3eKHtwDISNgTI41LTYr-1DpIa;-M4y`0Z{h&RliqlZ&|a;4%!p`38P-r5KAZ zJOcuI^+GRbvtq=qfa7oXFH-+%mn0mYE{vR3pgeqB!7tzMi6j)TGv(c%Mc&5YnOfXG z>t^bV3V8ig9?P5i9<X~zx20$%NKqL?ZC;8RL5`XU1t5O36jbSi W>Ht-D_yJI{p{@;^>Yh*GiQfR8z_&C2 delta 1813 zcmcIkeN0GjT3Bw>&g+J6Rj!b0yG3O?pS3cH86E~wL`MvWy z_nv$1x%Zs=f)~Z$c`>q!;Vz9?J(K%rb~iS%3))mc5NretPnprqbohcQ2parNbrK_L zF|^l+qv9>;kHy8sI`XQ=kJTB{^TfId9ieIi&Z+l-h!&Quo+!C-_9bl8T)=>8REe=B zV`Cb*(b`qXT(-@mMOt29B9gH@sCXq4PbVllK0x|G!foObX>8EurmQ2fiSQyp&j+=B zSg-iDlUYw78j~Z$gZy^N4yM%;WrXD;YN3m_>h^$`5;w*dQYsnxbq;8y$=x8u0>yja zg8m|(GJ2rbIK`*ZNSgwG35_iqzLG#mU`>4Rmiu~`oXMh@H$-;T$Zwi8s%X{%)6|mF zk_~d6DCaOakA?QSx!XPq+`M@Pu&FDJr@5~|uV;I#2ukR-534_bP=mJDct@va&2%_DeZ1oO|_U4EA*5^`kZT%~Qo7pzo+l*Wnk6g?&Pe&@9yQiPxS@ zHEa_~Da&@jCzK0z`nrS)v~(BowzrN!(p94%7-(7&uxel!WUL-&#EyO^_P+fIL=>xc zXgh!Rol1a{WZCfh{%zReHf-wXX!qKEg=H>Zk=5_;xvXxx-D~wZJsxYhv!cS|E%z2y z`0SnU)2gPvFC}nc<)DPK$G6~-0Y6ra==z?}!u>cHHpF(8_^3PyCJW`VB8Q3O5CXA0 zqC>f$e|=?+bRofrrI%cZ0jGy2^#!YLmWdMLS{@mxV$q-HA^INmdK34V_Q0x-u!ZPG zLSRTaFdvT=fgE9I3Gc+2>0~@NkcV~C-zHvw^KLJ|(DKZoW?S2HwgVWtl!*;zQu*f5 zN%dV8aQxm1m{7Jm)r8o=a6GydD^I*3pJzs^*Wqwj{cc}{!x1P7c)h;P|FyoNBm@#R zcBN9#r>n%eOXHLe|r5Ce*J4c=3jms4)Rwnw?n9AEv}vQV$+W{ z-Zpy-V^NMJ$pX>*M5->;}uI5*@@ctx|zdB&Q1 zy*$To{_}L6e(eg#HyP@~kMZ&OW>$J!`N1yBXT*0Bk3Wzg{AUM6cGitalLcc>CP7$r z3Pkx9!?N0{v8q&vsD`z`hINoMoJl$zv~T7@knU*r*tsll!bdp}WJ_iaIMsgw0aaIe diff --git a/Context.js b/Context.js index fb5d787c5..826341bbe 100644 --- a/Context.js +++ b/Context.js @@ -147,7 +147,7 @@ if (FULL_LOG === true) { logger.write("[INFO] initialize -> getStatusReport -> Entering function."); } let fileName = "Status.Report.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor; if (FULL_LOG === true) { logger.write("[INFO] initialize -> getStatusReport -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> getStatusReport -> filePath = " + filePath); } @@ -205,7 +205,7 @@ if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> Entering function."); } let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME; + 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; if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> filePath = " + filePath); } @@ -266,7 +266,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.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME + "/" + dateForPath; + 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; if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> filePath = " + filePath); } @@ -426,7 +426,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.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME + "/" + dateForPath; + 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; if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> filePath = " + filePath); } @@ -486,7 +486,7 @@ if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> Entering function."); } let fileName = "Execution.History.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.EXCHANGE_NAME; + 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; if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> filePath = " + filePath); } @@ -562,7 +562,7 @@ if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeStatusReport -> Entering function."); } let fileName = "Status.Report.json" - let filePath = bot.devTeam + "/" + bot.codeName + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.EXCHANGE_NAME; + let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Processes/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor; if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeStatusReport -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeStatusReport -> filePath = " + filePath); } diff --git a/Debug Log.js b/Debug Log.js index 2abaf5cdd..3212264e3 100644 --- a/Debug Log.js +++ b/Debug Log.js @@ -40,11 +40,11 @@ createFolderSync(folderPath); - folderPath = '../../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "/" + thisObject.bot.version; + folderPath = '../../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor; createFolderSync(folderPath); - folderPath = '../../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "/" + thisObject.bot.version + "/" + thisObject.bot.process; + folderPath = '../../Logs/' + thisObject.bot.devTeam + "/" + thisObject.bot.type + "/" + thisObject.bot.codeName + "." + thisObject.bot.version.major + "." + thisObject.bot.version.minor + "/" + thisObject.bot.process; createFolderSync(folderPath); diff --git a/Project.njsproj b/Project.njsproj index 1eb413ca3..f88c2ef97 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -45,7 +45,7 @@ - + diff --git a/Run.js b/Run.js index 76c1b44eb..4f8d1c7db 100644 --- a/Run.js +++ b/Run.js @@ -8,11 +8,10 @@ global.RUNNING_MODE = 'Production'; // 'Testnet' or 'Production' /* First thing to do is to read the config and guess which bot we will be running. */ var fs = require('fs'); -let vmConfig; try { - vmConfig = JSON.parse(fs.readFileSync('this.vm.config.json', 'utf8')); + global.PLATFORM_CONFIG = JSON.parse(fs.readFileSync('platform.config.json', 'utf8')); } catch (err) { @@ -28,7 +27,7 @@ let botConfig; try { - botConfig = JSON.parse(fs.readFileSync(vmConfig.bot.path + '/this.bot.config.json', 'utf8')); + botConfig = JSON.parse(fs.readFileSync(global.PLATFORM_CONFIG.bot.path + '/this.bot.config.json', 'utf8')); } catch (err) { console.log("[ERROR] 'readConfig' - ERROR : " + err.message); @@ -167,7 +166,7 @@ for (let i = 0; i < botConfig.processes.length; i++) { const newIntervalExecutor = INTERVAL_EXECUTOR_MODULE.newIntervalExecutor(bot); - newIntervalExecutor.initialize(vmConfig.bot.path, processConfig, year, month, onInitializeReady); + newIntervalExecutor.initialize(global.PLATFORM_CONFIG.bot.path, processConfig, year, month, onInitializeReady); function onInitializeReady() { @@ -192,7 +191,7 @@ for (let i = 0; i < botConfig.processes.length; i++) { const newIntervalExecutor = INTERVAL_EXECUTOR_MODULE.newIntervalExecutor(bot); - newIntervalExecutor.initialize(vmConfig.bot.path, processConfig, processConfig.startMode.oneMonth.year, processConfig.startMode.oneMonth.month, onInitializeReady); + newIntervalExecutor.initialize(global.PLATFORM_CONFIG.bot.path, processConfig, processConfig.startMode.oneMonth.year, processConfig.startMode.oneMonth.month, onInitializeReady); function onInitializeReady() { @@ -218,7 +217,7 @@ for (let i = 0; i < botConfig.processes.length; i++) { const newIntervalExecutor = INTERVAL_EXECUTOR_MODULE.newIntervalExecutor(bot); - newIntervalExecutor.initialize(vmConfig.bot.path, processConfig, undefined, undefined, onInitializeReady); + newIntervalExecutor.initialize(global.PLATFORM_CONFIG.bot.path, processConfig, undefined, undefined, onInitializeReady); function onInitializeReady() { @@ -243,7 +242,7 @@ function runTradingBot(pProcessConfig) { if (FULL_LOG === true) { logger.write("[INFO] runTradingBot -> Entering function."); } let tradingBotMainLoop = TRADING_BOT_MAIN_LOOP_MODULE.newTradingBotMainLoop(botConfig); - tradingBotMainLoop.initialize(vmConfig.bot.path, pProcessConfig, onInitializeReady); + tradingBotMainLoop.initialize(global.PLATFORM_CONFIG.bot.path, pProcessConfig, onInitializeReady); function onInitializeReady(err) { diff --git a/Trading Bot Main Loop.js b/Trading Bot Main Loop.js index 10b5840e3..e4da9c327 100644 --- a/Trading Bot Main Loop.js +++ b/Trading Bot Main Loop.js @@ -352,12 +352,11 @@ function shallWeStop() { var fs = require('fs'); - let vmConfig; try { - vmConfig = JSON.parse(fs.readFileSync('this.vm.config.json', 'utf8')); - return JSON.parse(vmConfig.stopGracefully); + global.PLATFORM_CONFIG = JSON.parse(fs.readFileSync('platform.config.json', 'utf8')); + return JSON.parse(global.PLATFORM_CONFIG.stopGracefully); } catch (err) { const logText = "[ERROR] 'readConfig' - ERROR : " + err.message; diff --git a/this.vm.config.json b/platform.config.json similarity index 50% rename from this.vm.config.json rename to platform.config.json index aa2288eab..95ce357d7 100644 --- a/this.vm.config.json +++ b/platform.config.json @@ -1,4 +1,10 @@ { + "codeName": "AACloudPlatform", + "version": { + "major": 1, + "minor": 0, + "patch": 0 + }, "bot": { "path": "../Bots/AAMasters/AAMariam-Trading-Bot" },