From 53106e88f46322db1d401317f74ed666f596851f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 22 Sep 2019 15:32:47 +0200 Subject: [PATCH] Removed Updating files base on setInterval and now is based on events when the status report is saved. --- src/DailyFiles.js | 2 +- src/FileCursor.js | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/DailyFiles.js b/src/DailyFiles.js index 2bbda5c6a..14d77eeac 100644 --- a/src/DailyFiles.js +++ b/src/DailyFiles.js @@ -110,7 +110,7 @@ function newDailyFiles () { if (pSet.validPeriods.includes(periodName) === true) { let fileCursor = newFileCursor() fileCursor.eventHandler = thisObject.eventHandler // We share our event handler with each file cursor, so that they can raise events there when files are changed.s - fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, beginDateRange, endDateRange, onInitialized) + fileCursor.initialize(fileCloud, pDevTeam, pBot, pProduct, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, beginDateRange, endDateRange, onInitialized) function onInitialized (err) { try { switch (err.result) { diff --git a/src/FileCursor.js b/src/FileCursor.js index 54725ba3e..19dde9d7e 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -27,22 +27,35 @@ function newFileCursor () { let fileCloud let devTeam let bot + let product let thisSet let periodName let timePeriod let beginDateRange let endDateRange - let intervalHandle let finalized = false + let eventSubscriptionIdDatasetUpdated + return thisObject function finalize () { try { + systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated) thisObject.eventHandler = undefined - clearInterval(intervalHandle) + market = undefined + exchange = undefined + fileCloud = undefined + devTeam = undefined + bot = undefined + product = undefined + thisSet = undefined + periodName = undefined + timePeriod = undefined + beginDateRange = undefined + endDateRange = undefined thisObject.files = undefined cursorDate = undefined @@ -55,13 +68,14 @@ function newFileCursor () { } } - function initialize (pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, pBeginDateRange, pEndDateRange, callBackFunction) { + function initialize (pFileCloud, pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, pBeginDateRange, pEndDateRange, callBackFunction) { try { market = pMarket exchange = pExchange fileCloud = pFileCloud devTeam = pDevTeam bot = pBot + product = pProduct thisSet = pSet periodName = pPeriodName cursorDate = removeTime(pCursorDate) @@ -69,11 +83,14 @@ function newFileCursor () { beginDateRange = pBeginDateRange endDateRange = pEndDateRange - setTimePeriod(pCurrentTimePeriod, pCursorDate) - - intervalHandle = setInterval(updateFiles, timePeriod) + let key = devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + thisSet.codeName + systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles) callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) + + function onResponse (message) { + eventSubscriptionIdDatasetUpdated = message.eventSubscriptionId + } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = ' + err.stack) } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE)