diff --git a/.vs/AAOlivia/v15/.suo b/.vs/AAOlivia/v15/.suo index 45232f6e9..b27bc341e 100644 Binary files a/.vs/AAOlivia/v15/.suo and b/.vs/AAOlivia/v15/.suo differ diff --git a/AAOlivia.njsproj b/AAOlivia.njsproj index e497b5ee8..8ab422a6c 100644 --- a/AAOlivia.njsproj +++ b/AAOlivia.njsproj @@ -6,7 +6,8 @@ {aa2901bc-8f81-40f0-a402-5ca79a3f22ad} ShowAllFiles - Multi-Period-Market\run.js + + c:\users\luis\source\repos\AAOlivia\Multi-Period-Market . {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD} @@ -19,12 +20,7 @@ - - - - - @@ -33,7 +29,6 @@ - diff --git a/Multi-Period-Market/Interval.js b/Multi-Period-Market/Interval.js index 466eaeae6..79a02bfcc 100644 --- a/Multi-Period-Market/Interval.js +++ b/Multi-Period-Market/Interval.js @@ -96,35 +96,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each try { if (LOG_INFO === true) { - logger.write("[INFO] Entering function 'start', with year = " + year + " and month = " + month); - } - - let processDate = new Date(year + "-" + month + "-1 00:00:00.000 GMT+0000"); - - let lastMinuteOfMonth = new Date(year + "-" + month + "-1 00:00:00.000 GMT+0000"); - - lastMinuteOfMonth.setUTCMonth(lastMinuteOfMonth.getUTCMonth() + 1); // First we go 1 month into the future. - lastMinuteOfMonth.setUTCSeconds(lastMinuteOfMonth.getUTCSeconds() - 30); // Then we go back 30 seconds, or to the last minute of the original month. - - let thisDatetime = new Date(); - - if ((year === thisDatetime.getUTCFullYear() && parseInt(month) > thisDatetime.getUTCMonth() + 1) || year > thisDatetime.getUTCFullYear()) { - - logger.write("[INFO] We are too far in the future. Interval will not execute. Sorry."); - return; - - } - - let atHeadOfMarket; // This tell us if we are at the month which includes the head of the market according to current datetime. - - if ((year === thisDatetime.getUTCFullYear() && parseInt(month) === thisDatetime.getUTCMonth() + 1)) { - - atHeadOfMarket = true; - - } else { - - atHeadOfMarket = false; - + logger.write("[INFO] Entering function 'start'"); } let nextIntervalExecution = false; // This tell weather the Interval module will be executed again or not. By default it will not unless some hole have been found in the current execution. diff --git a/this.bot.config.json b/this.bot.config.json index 5cec80417..48c155288 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -11,17 +11,17 @@ "description": "Produces different files with multi-period candles and volumes for entire markets.", "startMode": { "allMonths": { - "run": "true", - "minYear": "2014", - "maxYear": "2018" + "run": "false", + "minYear": "", + "maxYear": "" }, "oneMonth": { "run": "false", - "year": "2018", - "month": "2" + "year": "", + "month": "" }, "noTime": { - "run": "false" + "run": "true" } }, "intervalLapse": 3600000,