Merge remote-tracking branch 'upstream/develop'

This commit is contained in:
Matias committed 2019-03-25 17:59:58 +01:00
commit bbf6312e34
3 files changed
+7 -2

No files matched your search

-1
View File
@@ -247,7 +247,6 @@
*/
contextVariables.lastFile = new Date(contextVariables.dateBeginOfMarket.getUTCFullYear() + "-" + (contextVariables.dateBeginOfMarket.getUTCMonth() + 1) + "-" + contextVariables.dateBeginOfMarket.getUTCDate() + " " + "00:00" + GMT_SECONDS);
//contextVariables.lastFile = new Date(contextVariables.lastFile.valueOf() + ONE_DAY_IN_MILISECONDS);
if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> thisReport.lastFile === undefined"); }
if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> contextVariables.lastFile = " + contextVariables.lastFile); }
+5
View File
@@ -287,6 +287,11 @@
if(global.EXECUTION_CONFIG.timePeriod){
processConfig.timePeriod = global.EXECUTION_CONFIG.timePeriod
}
if (processConfig.framework.name === "Multi-Period-Daily") {
processConfig.framework.startDate.fixedDate = processConfig.startMode.noTime.beginDatetime;
processConfig.framework.startDate.resumeExecution = processConfig.startMode.noTime.resumeExecution;
}
try {
+2 -1
View File
@@ -93,7 +93,8 @@ function readExecutionConfiguration() {
}
let noTime = {
run: "false",
beginDatetime: process.env.BEGIN_DATE_TIME
beginDatetime: process.env.BEGIN_DATE_TIME,
resumeExecution: process.env.RESUME_EXECUTION
}
let fixedInterval = {
run: "false",