From b7bdbc6e1d14dbf7999e05d9365019cdc9d3a25b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 18 May 2019 19:32:35 +0200 Subject: [PATCH] Cleaning and allowing that daily or market dont block plotter initialization when they are not there --- src/DailyFiles.js | 93 ++-------------------------------------------- src/MarketFiles.js | 46 +---------------------- 2 files changed, 4 insertions(+), 135 deletions(-) diff --git a/src/DailyFiles.js b/src/DailyFiles.js index 57825c527..fe6eefe52 100644 --- a/src/DailyFiles.js +++ b/src/DailyFiles.js @@ -1,7 +1,6 @@  function newDailyFiles () { const MODULE_NAME = 'Daily Files' - const INFO_LOG = false const ERROR_LOG = true const logger = newWebDebugLog() logger.fileName = MODULE_NAME @@ -29,8 +28,6 @@ function newDailyFiles () { function finalize () { try { - if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') } - filesLoaded = undefined expectedFiles = undefined fileCloud = undefined @@ -38,8 +35,6 @@ function newDailyFiles () { fileCursors.forEach(finalizeEach) function finalizeEach (item, key, mapObj) { - if (INFO_LOG === true) { logger.write('[INFO] finalize -> finalizeEach -> Entering function.') } - item.finalize() } } catch (err) { @@ -49,9 +44,6 @@ function newDailyFiles () { function initialize (pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> key = ' + pDevTeam.codeName + '-' + pBot.codeName + '-' + pProduct.codeName) } - callBackWhenFileReceived = callBackFunction let exchange = ecosystem.getExchange(pProduct, pExchange) @@ -69,15 +61,11 @@ function newDailyFiles () { function onDataRangeReceived (err, pFile) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Entering function.') } - let beginDateRange let endDateRange switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Received OK Response.') } - beginDateRange = pFile.begin endDateRange = pFile.end @@ -85,22 +73,16 @@ function newDailyFiles () { } case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Received FAIL Response.') } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) return } case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> err.message = ' + err.message) } - if (err.message === 'File does not exist.') { - if (INFO_LOG === true) { logger.write('[WARN] initialize -> onFileReceived -> No Date Range file found. maxDate will be set to current datetime. ') } - - endDateRange = new Date() - break + err.message = 'Dataset Unavailable.' + callBackFunction(err) + return } - if (err.message === 'Missing Configuration.') { if (ERROR_LOG === true) { logger.write('[WARN] initialize -> onFileReceived -> The needed configuration for the dateRange at the dataSet of the product was not found.') } if (ERROR_LOG === true) { logger.write('[WARN] initialize -> onFileReceived -> maxDate will be set to current datetime.') } @@ -108,62 +90,40 @@ function newDailyFiles () { endDateRange = new Date() break } - /* If none of the previous conditions are met, the we return the err to the caller. */ - callBackFunction(err) return } - default: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Received Unexpected Response.') } callBackFunction(err) return } } - /* Now we will get the daily files */ - for (i = 0; i < dailyFilePeriods.length; i++) { let periodTime = dailyFilePeriods[i][0] let periodName = dailyFilePeriods[i][1] - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> periodTime = ' + periodTime) } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> periodName = ' + periodName) } - if (pSet.validPeriods.includes(periodName) === true) { let fileCursor = newFileCursor() fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, beginDateRange, endDateRange, onInitialized) - function onInitialized (err) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> Entering function.') } - switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> Received OK Response.') } break } - case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> Received FAIL Response.') } callBackWhenFileReceived(GLOBAL.DEFAULT_FAIL_RESPONSE) return } default: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> Received Unexpected Response.') } callBackWhenFileReceived(err) return } } - fileCursors.set(periodTime, fileCursor) - - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> expectedFiles = ' + expectedFiles) } - expectedFiles = expectedFiles + fileCursor.getExpectedFiles() - - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> onInitialized -> expectedFiles = ' + expectedFiles) } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> onFileReceived -> onInitialized -> err = ' + err.stack) } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) @@ -171,20 +131,14 @@ function newDailyFiles () { } } } - loadThemAll() function loadThemAll () { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> loadThemAll -> Entering function.') } - for (i = 0; i < dailyFilePeriods.length; i++) { let periodTime = dailyFilePeriods[i][0] let periodName = dailyFilePeriods[i][1] - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> loadThemAll -> periodTime = ' + periodTime) } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> loadThemAll -> periodName = ' + periodName) } - if (pSet.validPeriods.includes(periodName) === true) { let fileCursor = fileCursors.get(periodTime) fileCursor.reload(onFileReceived) @@ -208,39 +162,24 @@ function newDailyFiles () { function onFileReceived (err) { try { - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> Entering function.') } - switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> Received OK Response.') } break } - case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> Received FAIL Response.') } callBackWhenFileReceived(GLOBAL.DEFAULT_FAIL_RESPONSE) return } - case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> err.message = ' + err.message) } - callBackWhenFileReceived(err) return } - default: { - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> Received Unexpected Response.') } callBackWhenFileReceived(err) return } } - filesLoaded++ - - if (INFO_LOG === true) { logger.write('[INFO] onFileReceived -> filesLoaded = ' + filesLoaded) } - callBackWhenFileReceived(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) // Note that the call back is called for every file loaded at each cursor. } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] onFileReceived -> err = ' + err.stack) } @@ -250,8 +189,6 @@ function newDailyFiles () { function getFileCursor (pPeriod) { try { - if (INFO_LOG === true) { logger.write('[INFO] getFileCursor -> Entering function.') } - return fileCursors.get(pPeriod) } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] getFileCursor -> err = ' + err.stack) } @@ -260,22 +197,13 @@ function newDailyFiles () { function setDatetime (pDatetime) { try { - if (INFO_LOG === true) { logger.write('[INFO] setDatetime -> Entering function.') } - filesLoaded = 0 expectedFiles = 0 - fileCursors.forEach(setDatetimeToEach) function setDatetimeToEach (fileCursor, key, map) { fileCursor.setDatetime(pDatetime) - - if (INFO_LOG === true) { logger.write('[INFO] setDatetime -> expectedFiles = ' + expectedFiles) } - expectedFiles = expectedFiles + fileCursor.getExpectedFiles() - - if (INFO_LOG === true) { logger.write('[INFO] setDatetime -> expectedFiles = ' + expectedFiles) } - fileCursor.reload(onFileReceived) } } catch (err) { @@ -285,22 +213,13 @@ function newDailyFiles () { function setTimePeriod (pTimePeriod, pDatetime) { try { - if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> Entering function.') } - filesLoaded = 0 expectedFiles = 0 - fileCursors.forEach(setTimePeriodToEach) function setTimePeriodToEach (fileCursor, key, map) { fileCursor.setTimePeriod(pTimePeriod, pDatetime) - - if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> expectedFiles = ' + expectedFiles) } - expectedFiles = expectedFiles + fileCursor.getExpectedFiles() - - if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> expectedFiles = ' + expectedFiles) } - fileCursor.reload(onFileReceived) } } catch (err) { @@ -309,16 +228,10 @@ function newDailyFiles () { } function getExpectedFiles () { - if (INFO_LOG === true) { logger.write('[INFO] getExpectedFiles -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] getExpectedFiles -> expectedFiles = ' + expectedFiles) } - return expectedFiles } function getFilesLoaded () { - if (INFO_LOG === true) { logger.write('[INFO] getFilesLoaded -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] getFilesLoaded -> filesLoaded = ' + filesLoaded) } - return filesLoaded } } diff --git a/src/MarketFiles.js b/src/MarketFiles.js index 6e1797655..b0496d89a 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -1,7 +1,6 @@  function newMarketFiles () { const MODULE_NAME = 'Market Files' - const INFO_LOG = false const ERROR_LOG = true const logger = newWebDebugLog() logger.fileName = MODULE_NAME @@ -39,8 +38,6 @@ function newMarketFiles () { function finalize () { try { - if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') } - clearInterval(intervalHandle) filesLoaded = undefined @@ -53,9 +50,6 @@ function newMarketFiles () { function initialize (pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, callBackFunction) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> key = ' + pDevTeam.codeName + '-' + pBot.codeName + '-' + pProduct.codeName) } - exchange = ecosystem.getExchange(pProduct, pExchange) if (exchange === undefined) { @@ -83,8 +77,6 @@ function newMarketFiles () { function onFileReceived (err, file) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onFileReceived -> Entering function.') } - if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { files.set(periodTime, file) filesLoaded++ @@ -93,11 +85,7 @@ function newMarketFiles () { } if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { - if (filesLoaded > filesNotLoaded) { - callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) - } else { - callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE, thisObject) - } + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> onFileReceived -> err = ' + err.stack) } @@ -117,8 +105,6 @@ function newMarketFiles () { if (finalized === true) { return } let updateFiles = 0 - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> Entering function.') } - /* Now we will get the market files */ for (let i = 0; i < marketFilesPeriods.length; i++) { @@ -130,40 +116,10 @@ function newMarketFiles () { function onFileReceived (err, file) { try { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> Entering function.') } - - switch (err.result) { - case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> Received OK Response.') } - break - } - - case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> Received FAIL Response.') } - return - } - - case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> err.message = ' + err.message) } - return - } - - default: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> Received Unexpected Response.') } - return - } - } - files.set(periodTime, file) updateFiles++ if (updateFiles === marketFilesPeriods.length) { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> All files received. ') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> devTeam = ' + devTeam.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> bot = ' + bot.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> thisSet = ' + thisSet.codeName) } - thisObject.eventHandler.raiseEvent('Files Updated', undefined) } } catch (err) {