From b1414987a0c838af3ff00cec728bb540bec3842d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 20 Jun 2018 11:46:47 +0200 Subject: [PATCH] Status Report re written --- Multi-Period-Daily/User.Bot.js | 62 +++++++--------------------------- this.bot.config.json | 20 ----------- 2 files changed, 13 insertions(+), 69 deletions(-) diff --git a/Multi-Period-Daily/User.Bot.js b/Multi-Period-Daily/User.Bot.js index 27e278be9..1402b8f54 100644 --- a/Multi-Period-Daily/User.Bot.js +++ b/Multi-Period-Daily/User.Bot.js @@ -1175,68 +1175,32 @@ } } - function writeStatusReport(currentDay, callBackFunction) { + function writeStatusReport(lastFileDate, callBack) { - if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'writeStatusReport'"); - } + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> writeStatusReport -> Entering function."); } + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> writeStatusReport -> lastFileDate = " + lastFileDate); } try { - let reportFilePath = EXCHANGE_NAME + "/" + bot.name + "/" + bot.dataSetVersion + "/Processes/" + bot.process; + let reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; + let thisReport = statusDependencies.statusReports.get(reportKey); - utilities.createFolderIfNeeded(reportFilePath, tomAzureFileStorage, onFolderCreated); - - function onFolderCreated() { - - try { - - let lastFileDate = new Date(); - - let fileName = "Status.Report." + market.assetA + '_' + market.assetB + ".json"; - - let report = { - lastFile: { - year: currentDay.getUTCFullYear(), - month: (currentDay.getUTCMonth() + 1), - days: currentDay.getUTCDate() - }, - lastEndValues: currentEndValues - }; - - let fileContent = JSON.stringify(report); - - tomAzureFileStorage.createTextFile(reportFilePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated() { - - if (LOG_INFO === true) { - logger.write("[INFO] 'writeStatusReport' - Content written: " + fileContent); - } - - callBackFunction(); - } - } - catch (err) { - const logText = "[ERROR] 'writeStatusReport - onFolderCreated' - ERROR : " + err.message; - logger.write(logText); - closeMarket(); - } - } + thisReport.file.lastExecution = bot.processDatetime; + thisReport.file.lastFile = lastFileDate; + thisReport.save(callBack); } catch (err) { - const logText = "[ERROR] 'writeStatusReport' - ERROR : " + err.message; - logger.write(logText); - closeMarket(); + logger.write(MODULE_NAME, "[ERROR] start -> writeStatusReport -> err = " + err.message); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } - } + } catch (err) { - const logText = "[ERROR] 'Start' - ERROR : " + err.message; - logger.write(logText); + logger.write(MODULE_NAME, "[ERROR] 'Start' - ERROR : " + err.message); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } }; diff --git a/this.bot.config.json b/this.bot.config.json index 8aa077520..a9fb162d2 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -38,26 +38,6 @@ "sleepWaitTime": 3600000, "comaWaitTime": 86400000, "statusDependencies": [ - { - "devTeam": "AAMasters", - "bot": "AACharly", - "botVersion": { - "major": 1, - "minor": 0 - }, - "process": "Poloniex-Historic-Trades", - "dataSetVersion": "dataSet.V1" - }, - { - "devTeam": "AAMasters", - "bot": "AAOlivia", - "botVersion": { - "major": 1, - "minor": 0 - }, - "process": "Multi-Period-Market", - "dataSetVersion": "dataSet.V1" - }, { "devTeam": "AAMasters", "bot": "AATom",