diff --git a/.vs/AAOlivia-Indicator-Bot/v15/.suo b/.vs/AAOlivia-Indicator-Bot/v15/.suo index 16a99eaa0..5a3b24ed8 100644 Binary files a/.vs/AAOlivia-Indicator-Bot/v15/.suo and b/.vs/AAOlivia-Indicator-Bot/v15/.suo differ diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index 83e227fd2..e2c29befd 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -118,7 +118,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for contextVariables.firstTradeFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); - reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1"; + reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + bot.processDatetime.getUTCFullYear() + "-" + utilities.pad(bot.processDatetime.getUTCMonth(),2); thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { @@ -622,7 +622,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for let reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; let thisReport = dependencies.statusReports.get(reportKey); - thisReport.file.lastExecution = global.processDatetime; + thisReport.file.lastExecution = bot.processDatetime; thisReport.file.lastFile = lastFileDate; thisReport.save(callBack); diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index b89950662..22445fd8a 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -118,7 +118,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark contextVariables.firstTradeFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); - reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1"; + reportKey = "AAMasters" + "-" + "AABruce" + "-" + "One-Min-Daily-Candles-Volumes" + "-" + "dataSet.V1" + bot.processDatetime.getUTCFullYear() + "-" + utilities.pad(bot.processDatetime.getUTCMonth(),2); thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { diff --git a/this.bot.config.json b/this.bot.config.json index 861415ff7..4a2418fa5 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -28,8 +28,9 @@ "run": "true" } }, - "executionWaitTime": 3600000, + "normalWaitTime": 60000, "retryWaitTime": 10000, + "sleepWaitTime": 3600000, "dependencies": [ { "devTeam": "AAMasters", @@ -82,8 +83,9 @@ "run": "true" } }, - "executionWaitTime": 60000, + "normalWaitTime": 60000, "retryWaitTime": 10000, + "sleepWaitTime": 3600000, "dependencies": [ { "devTeam": "AAMasters",