From 6cbe3774e0321ef97e2b3ac5ec17d3a2dd353662 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 29 Apr 2018 12:54:59 +0200 Subject: [PATCH] File Modules Upgraded to Log on Console and handle ERR at callbacks. --- .vs/AAWeb/v15/.suo | Bin 66048 -> 64512 bytes Files/File.js | 50 ++++++++++++++++++-- Files/FileCache.js | 55 ++++++++++++++++++++-- Files/FileCursor.js | 77 ++++++++++++++++++++++++++---- Files/FileCursorCache.js | 69 +++++++++++++++++++++------ ProductStorage.js | 99 +++++++++++++++++++++++++++++++++++++-- TimelineChart.js | 2 - server.js | 2 +- 8 files changed, 317 insertions(+), 37 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 9a858dd1e574f2442dfff25b5af77e03e88876fa..da05efcc939af4c6f609bdf3de3604a6a3002190 100644 GIT binary patch delta 3409 zcmcIl4Nz276yE!I%f4L~SboKyWL*JC6n2#m{J~vZi2MUFjSK}%M@3BrK@g!`(`qJ6 z-FNVBOuz>wiH)+aW*jxxvQek0$(jD9VoIH9nyGPW8ZF5mI_K?M1v9Ot&YSPubMHO( z+;h)&f81Mn_w}HiQ?wx(jV7qmF^FS9Fp`VYUwrY}g2Uf_!m^->bFpr?#%*C4urX+p zs{}1;hu{xIi@4QySAwxV4sly;;!%%4=n-QOcP;z+!m&d{!vQ1#hrNsi~Bo{xA+Z7alb9^y&Fd_*8i zMW{cGC`QmY6hj|%&ZP#}s2#@EdFGCWMy+Y&hPyU>HLAW5%UZ-H1O^`|aBQ37}Y@GAkd>1l#1RSw!ISg-cfk2lW-55%AS8Ff8` z+=V7E6{jf+rh`s)a%J(SY=8&4+x;FED<0&lB}UHs(vBc@7Is#ZOV4xC3%r;*A2!y^ zf5fT@d^iflU!xKQ&edeL+8dZM_){9pmI8CkfQFn{8jUZ)pX_COgO5RZon5S7WV-%q zY3>QHucTq0J@Ja*`5Lnr3GR9~h;_rExUTIXcCWw(?sVCniw=EmyQ<98iDwgGoO>Sl zwx{EbGg)~7>Fx19VLHt|a2$9{^n90iwAz*agZa$fE7eoW-dt6AgG^{wq4b#i)`Dg? zT9-gsV+NyfB~bc?2~zhb!OYR=sA2(tqVG8+&kcEdx9*hFgt2Fyie{IP}_HUeGx2 z42JU76XDf?9g0(wqaF+O-CMxEe<%pjsqkb*+40LVEFP6TO{dch#EZ>*)`U zBV*No3oum%Fz)(@reuMT6U5_g=;@9}$0r9wN15%v-hsmhOooHEWfT$j0Ouj}cn2g2UTs=WyhCbpFu&y4mCIpm zv-OSwmhKrb^d9@g;-mMN4zY7UQo=%LDbuSe)~~C;b)nEL#Z$8ic?fb1@+hc{!Hp_oUM6CBR7c6tW+d<%w#{aLZn56ePxu9z}`x~sl zzLs~*rT$bY|NEp+1ILaI`I|}mXDJTkL?`_m3>7CWkdhMtH6O)5M_i~}biSQQzw%%y nPXg;nLAHK)fr0nb7?_Qn88^>Ur*xBRV;mH|GwJO~>@52Opf7>= delta 4466 zcmeHJdr(y86~Euz3*BWG*yXVpP+U+D705yX(VApeHb9NQt|B!E#*J|bs6cpFMD1=y zCX%{FxF?N|Bnp=dLt<-#*U3zb#x=A_CY=E~%{0?AW2Vz4nPDbvGNTD*CeU;4?uA9d zq)j{NKRG+U{T}Cgp5Hm=yWUBSw@c_*AEx6tjvuz`d8UUHeyMK!_F(;~5B|vP(9V0< z2;Ab2uyQz{Ihe8yM|R$Ye<)#yucl{Z3ak0Ot_062RH)r%tfvIq0+tp;G9nE@V-m1j ziuhr$y#&ir#0tc6L=0jvVi{sJq6DEwdmSLkDQGswG zTwvEFq>$!8Y}FvD5!(?v5VeSh5L0jvh9ig&A}#|Fk5GwI=UA|hh@-V4 zuvCeowgKBjTrna@oM#?$_o4FZn9IWcNCYyc5JwBH#5xhM21{zI#8F)pB5o}r8}TCq z5qA%Q^obl^mnuoUt|WLWERI$6x>iGn&R`5RI*ovFVKMaR3}JORw;uX+30m5jI0C;e zZsmTg{0z~7IDqIx9753Cp9f11mQ(PR?ubBBp(|p!_B?jIih!3Qwy`PrgRr!>*#Ud? z@9H>)-9}QGtQqWeXg7G+HMo`NVXr}ZbM>pS z64Zj*5+}!If1(ldO2KZ+#N#`eb{h_$;Gxk5vM$|_M64{*F*Mn<1{;CvR{9v;)t=^n z(d&!k+JXVr+o+RunUhRro2Qwyo)_aBTH2CQMd0jl6)?i*$T#B*OtJ|Vmk+SzIbDq} zzfs!oWcNQhcXVHPVG_qG{zjW!#@%ip;LWtPHcUj9(VfOI@CIiImsLz&dK0gyTq{^wKH#AZ%FO>_@4qj^Hr7B*m-fsN3pc^*X9$#w@ z%QgJ^@~UC9P`vD|_7bULvqP~BW#Pc>o8MsqrPaW__B!FWycKS?j0;LIkwI^^8hELa zXFK8g`eN|Cnkc&;Ij5m5H}PUkTlkN0c8IH1DBgq@P?ii+{8qlbqJjy|nQd13r2V|O zG8LrwRPAQ$rT`C|r_jeh{3KaU?s$~33FtY{EEbmvl`~U|$H?-~R^nqFU{7g)^Yu}% z)w>l&y}677`(yWskNL&DrNW|_De9&6&R$A?1+|o>QRHh!8557y8l#3>oxfabOZFYL zPwPLrG=heU1@Ez6$Pt~NGqJ}D)^3~Vvx&VQCWWO{MSM~A=Uaa(^B=0osC|Rh3D7ky z9TG0?KcNYneW5d6Jc<-9xaAXG@rob3Jp~c>V|vcPUjZjx^(rJMXNZ5yK`k58Tb#-ED6__zyGm*Nr4tHza!%glMxZan^&QMqMmS*>^-K{l6b?%lntV91;7MyXWgHXtsV{2U z*Sx!}zOBBg5nShTVc$R$Ogwu^&~uJ?hs=spPy9%BLu(fNRZN-RGkdF?S4vC@9l<{( z1<4hCdzhRvwu8kMhA1&7kjRZgRm}WWprQP~hyU~lJLXstKK+decAm{ew3{bphNt`g zg7wE~_)|f{3*oc&FhkG+lTn?E%FRXhgcd0_*gu)9V&`cMgV6CWHTq7P`9&#j8ULhWz^t=XLkoJ9#-Y z>n+J56)y@%o!y=5B4$V9J5jAsnLodxNtTQ!oNcgv=d1v|BVN(3M`@g(?<=5 z9=HK)+nNmr+OOZ-u@LYO(CL!m4H<{?7pAVP$i7BQ;nIKIF X(oF&K{EK09BnryvqvXQR-_raGI$f5L diff --git a/Files/File.js b/Files/File.js index 611506ea0..933524ec6 100644 --- a/Files/File.js +++ b/Files/File.js @@ -1,7 +1,12 @@  function newFile() { - let fileObject = { + const MODULE_NAME = "File"; + const FULL_LOG = true; + const logger = newDebugLog(); + logger.fileName = MODULE_NAME; + + let thisObject = { getFile: getFile, initialize: initialize } @@ -9,10 +14,13 @@ function newFile() { let fileCloud; let file; - return fileObject; + return thisObject; function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + let exchange = ecosystem.getExchange(pProduct, pExchange); if (pExchange !== undefined && exchange === undefined) { // We support no exchange as a parameter, but if provided, then it must be at the list of exchanges of that product. @@ -28,18 +36,52 @@ function newFile() { fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, undefined, undefined, undefined, onFileReceived); - function onFileReceived(pFile) { + function onFileReceived(err, pFile) { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } file = pFile; callBackFunction(); } - } function getFile() { + if (FULL_LOG === true) { logger.write("[INFO] getFile -> Entering function."); } + return file; } diff --git a/Files/FileCache.js b/Files/FileCache.js index 7187fb859..6fe8e180a 100644 --- a/Files/FileCache.js +++ b/Files/FileCache.js @@ -1,7 +1,12 @@  function newFileCache() { - let fileCache = { + const MODULE_NAME = "File Cache"; + const FULL_LOG = true; + const logger = newDebugLog(); + logger.fileName = MODULE_NAME; + + let thisObject = { getFile: getFile, getExpectedFiles: getExpectedFiles, getFilesLoaded: getFilesLoaded, @@ -14,10 +19,13 @@ function newFileCache() { let files = new Map; - return fileCache; + return thisObject; function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + let exchange = ecosystem.getExchange(pProduct, pExchange); if (exchange === undefined) { @@ -40,13 +48,46 @@ function newFileCache() { fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, periodName, undefined, undefined, onFileReceived); - function onFileReceived(file) { + function onFileReceived(err, file) { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } files.set(periodTime, file); filesLoaded++; - callBackFunction(); // Note that the callback is called for every file loaded. + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE); // Note that the callback is called for every file loaded. } } @@ -55,18 +96,24 @@ function newFileCache() { function getFile(pPeriod) { + if (FULL_LOG === true) { logger.write("[INFO] getFile -> Entering function."); } + return files.get(pPeriod); } function getExpectedFiles() { + if (FULL_LOG === true) { logger.write("[INFO] getExpectedFiles -> Entering function."); } + return marketFilesPeriods.length; } function getFilesLoaded() { + if (FULL_LOG === true) { logger.write("[INFO] getFilesLoaded -> Entering function."); } + return filesLoaded; } diff --git a/Files/FileCursor.js b/Files/FileCursor.js index f809fac6e..be268347b 100644 --- a/Files/FileCursor.js +++ b/Files/FileCursor.js @@ -1,10 +1,15 @@  function newFileCursor() { + const MODULE_NAME = "File Cursor"; + const FULL_LOG = true; + const logger = newDebugLog(); + logger.fileName = MODULE_NAME; + let files = new Map; let cursorDate; - let fileCursor = { + let thisObject = { setDatetime: setDatetime, setTimePeriod: setTimePeriod, files: undefined, @@ -12,7 +17,7 @@ function newFileCursor() { initialize: initialize } - fileCursor.files = files; + thisObject.files = files; let minCursorSize = 10; let maxCursorSize = 30; @@ -26,10 +31,13 @@ function newFileCursor() { let periodName; let timePeriod; - return fileCursor; + return thisObject; function initialize(pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pSet.codeName + "-" + pPeriodName); } + market = pMarket; exchange = pExchange; fileCloud = pFileCloud; @@ -46,6 +54,8 @@ function newFileCursor() { function setTimePeriod(pTimePeriod, pDatetime, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } + /* We are implementing here an algorithm designed to save bandwidth, memory and processing power at the browser. @@ -96,6 +106,8 @@ function newFileCursor() { function enterSavingMode() { + if (FULL_LOG === true) { logger.write("[INFO] setTimePeriod -> enterSavingMode -> Entering function."); } + switch (timePeriod) { case _45_MINUTES_IN_MILISECONDS: @@ -170,6 +182,8 @@ function newFileCursor() { function exitSavingMode() { + if (FULL_LOG === true) { logger.write("[INFO] setTimePeriod -> exitSavingMode -> Entering function."); } + switch (timePeriod) { case _45_MINUTES_IN_MILISECONDS: @@ -247,6 +261,8 @@ function newFileCursor() { function setDatetime(pDatetime, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } + if (pDatetime === undefined) { return; } cursorDate = pDatetime; @@ -258,6 +274,8 @@ function newFileCursor() { function getFiles(callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> Entering function."); } + let i = 0; let j = 0; @@ -267,6 +285,8 @@ function newFileCursor() { function getNextFile() { + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> getNextFile -> Entering function."); } + let targetDate = new Date(cursorDate); targetDate.setUTCDate(targetDate.getUTCDate() + j); @@ -293,7 +313,7 @@ function newFileCursor() { } else { - if (fileCursor.files.get(dateString) === undefined) { // We dont reload files we already have. + if (thisObject.files.get(dateString) === undefined) { // We dont reload files we already have. fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, targetDate, undefined, onFileReceived); @@ -306,9 +326,42 @@ function newFileCursor() { } - function onFileReceived(file) { + function onFileReceived(err, file) { - fileCursor.files.set(dateString, file); + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } + + thisObject.files.set(dateString, file); controlLoop(); @@ -317,9 +370,11 @@ function newFileCursor() { function controlLoop() { + if (FULL_LOG === true) { logger.write("[INFO] getFiles -> controlLoop -> Entering function."); } + if (callBackFunction !== undefined) { - callBackFunction(); + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE); } @@ -336,18 +391,20 @@ function newFileCursor() { function collectGarbage() { + if (FULL_LOG === true) { logger.write("[INFO] collectGarbage -> Entering function."); } + date = removeTime(cursorDate); let minDate = date.valueOf() - maxCursorSize * ONE_DAY_IN_MILISECONDS / 2; let maxDate = date.valueOf() + maxCursorSize * ONE_DAY_IN_MILISECONDS / 2; - for (let key of fileCursor.files.keys()) { + for (let key of thisObject.files.keys()) { let keyDate = new Date(key); if (keyDate.valueOf() < minDate || keyDate.valueOf() > maxDate) { - fileCursor.files.delete(key); + thisObject.files.delete(key); } @@ -357,6 +414,8 @@ function newFileCursor() { function getExpectedFiles() { + if (FULL_LOG === true) { logger.write("[INFO] getExpectedFiles -> Entering function."); } + return minCursorSize; } diff --git a/Files/FileCursorCache.js b/Files/FileCursorCache.js index 8015cd864..248e5c95d 100644 --- a/Files/FileCursorCache.js +++ b/Files/FileCursorCache.js @@ -1,9 +1,12 @@  function newFileCursorCache() { - const CONSOLE_LOG = false; + const MODULE_NAME = "File Cursor Cache"; + const FULL_LOG = true; + const logger = newDebugLog(); + logger.fileName = MODULE_NAME; - let fileCursorCache = { + let thisObject = { getFileCursor: getFileCursor, setDatetime: setDatetime, setTimePeriod: setTimePeriod, @@ -22,10 +25,13 @@ function newFileCursorCache() { let callBackWhenFileReceived; - return fileCursorCache; + return thisObject; function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + if (FULL_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + callBackWhenFileReceived = callBackFunction; let exchange = ecosystem.getExchange(pProduct, pExchange); @@ -59,23 +65,58 @@ function newFileCursorCache() { } } - function onFileReceived() { + function onFileReceived(err) { - console.log("FileCursorCache -> onFileReceived") + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> Received FAIL Response."); } + callBackWhenFileReceived(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> err.message = " + err.message); } + + callBackWhenFileReceived(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] onFileReceived -> Received Unexpected Response."); } + callBackWhenFileReceived(err); + return; + } + } filesLoaded++; - callBackWhenFileReceived(); // Note that the call back is called for every file loaded at each cursor. + callBackWhenFileReceived(GLOBAL.DEFAULT_OK_RESPONSE); // Note that the call back is called for every file loaded at each cursor. } function getFileCursor(pPeriod) { + if (FULL_LOG === true) { logger.write("[INFO] getFileCursor -> Entering function."); } + return fileCursors.get(pPeriod); } function setDatetime(pDatetime) { + if (FULL_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } + filesLoaded = 0; expectedFiles = 0; @@ -88,15 +129,14 @@ function newFileCursorCache() { } - if (CONSOLE_LOG === true) { + if (FULL_LOG === true) { logger.write("[INFO] setDatetime -> expectedFiles = " + expectedFiles); } - console.log("FileCursorCache -> setDatetime -> expectedFiles = " + expectedFiles); - - } } function setTimePeriod(pTimePeriod, pDatetime) { + if (FULL_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } + filesLoaded = 0; expectedFiles = 0; @@ -109,21 +149,22 @@ function newFileCursorCache() { } - if (CONSOLE_LOG === true) { + if (FULL_LOG === true) { logger.write("[INFO] setTimePeriod -> expectedFiles = " + expectedFiles); } - console.log("FileCursorCache -> setTimePeriod -> expectedFiles = " + expectedFiles); - - } } function getExpectedFiles() { + if (FULL_LOG === true) { logger.write("[INFO] getExpectedFiles -> Entering function."); } + return expectedFiles; } function getFilesLoaded() { + if (FULL_LOG === true) { logger.write("[INFO] getFilesLoaded -> Entering function."); } + return filesLoaded; } diff --git a/ProductStorage.js b/ProductStorage.js index 24d6d86d6..788f0526f 100644 --- a/ProductStorage.js +++ b/ProductStorage.js @@ -98,11 +98,42 @@ function newProductStorage(pName) { break; } - function onCacheFileReady() { + function onCacheFileReady(err) { if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> Entering function."); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onCacheFileReady -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } + let event = { totalValue: thisObject.fileCache.getExpectedFiles(), currentValue: thisObject.fileCache.getFilesLoaded() @@ -118,11 +149,42 @@ function newProductStorage(pName) { } } - function onFileCursorReady() { + function onFileCursorReady(err) { if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> Entering function."); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onFileCursorReady -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } + let event = { totalValue: thisObject.fileCursorCache.getExpectedFiles(), currentValue: thisObject.fileCursorCache.getFilesLoaded() @@ -138,11 +200,42 @@ function newProductStorage(pName) { } } - function onSingleFileReady() { + function onSingleFileReady(err) { if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> Entering function."); } if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> Received FAIL Response."); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> Received CUSTOM FAIL Response."); } + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> err.message = " + err.message); } + + callBackFunction(err); + return; + } + + default: { + + if (FULL_LOG === true) { logger.write("[INFO] initialize -> onSingleFileReady -> Received Unexpected Response."); } + callBackFunction(err); + return; + } + } + let event = { totalValue: 1, currentValue: 1 diff --git a/TimelineChart.js b/TimelineChart.js index 1800e6c8a..e8ce118f9 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -624,8 +624,6 @@ function tooTiny() { - if (FULL_LOG === true) { logger.write("[INFO] tooTiny -> Entering function."); } - if (viewPort.zoomLevel < Math.trunc(-28.25 * 100) / 100) { return true; } else { diff --git a/server.js b/server.js index 330817bd6..1cf8bb361 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {