Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Luis Fernando Molina committed 2019-03-17 20:39:11 +01:00
commit 4a54b31422
3 files changed
+7 -7

No files matched your search

+2 -1
View File
@@ -14,4 +14,5 @@ configs/Email.Config.json
configs/User.Profile.json
configs/Execution.Config.json
configs/Secret.Keys.json
.env
*.env
*.vscode*
+3
View File
@@ -813,6 +813,7 @@
}
let clonName = botConfig.codeName + "-" + "Clon" + clonKey;
clonName += ".1.0";
if (global.CURRENT_EXECUTION_AT === "Cloud") {
clonName += "-" + process.env.CLONE_ID;
@@ -842,6 +843,8 @@
clonName += "-" + process.env.CLONE_ID;
}
clonName += ".1.0";
botConfig.filePathRoot = botConfig.devTeam + "/" + clonName + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + global.EXCHANGE_NAME + "/" + botConfig.dataSetVersion;
pBotConfig.instance = clonName;
+2 -6
View File
@@ -80,7 +80,7 @@ function readExecutionConfiguration() {
backtest: backtest,
competition: competition
}
} else if (process.env.TYPE === 'Indicator' || process.env.TYPE === 'Extractor') {
} else if (process.env.TYPE === 'Indicator' || process.env.TYPE === 'Extraction') {
let allMonths = {
run: "false",
minYear: process.env.MIN_YEAR,
@@ -136,8 +136,6 @@ function readExecutionConfiguration() {
}
function readStoragePermissions() {
let filePath;
try {
console.log( "[INFO] Run -> readStoragePermissions -> Entering function. ");
@@ -187,10 +185,8 @@ function readStoragePermissions() {
startRoot();
}
}
catch (err) {
} catch (err) {
console.log("[ERROR] Run -> readStoragePermissions -> err = " + err.message);
console.log("[HINT] Run -> readStoragePermissions -> You need to have a file at this path -> " + filePath);
}
}