diff --git a/IndicatorBotProcessMainLoop.js b/IndicatorBotProcessMainLoop.js index 95f453280..fdc6d9945 100644 --- a/IndicatorBotProcessMainLoop.js +++ b/IndicatorBotProcessMainLoop.js @@ -46,7 +46,7 @@ if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err.message = " + err.message); + parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err = " + err.stack); callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } @@ -190,7 +190,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -293,7 +293,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -381,7 +381,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -394,7 +394,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -511,7 +511,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished -> Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished -> Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -524,7 +524,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -610,7 +610,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized > Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized > Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -623,7 +623,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -742,7 +742,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -755,7 +755,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -900,7 +900,7 @@ stopCallBack(); } } catch (err) { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); diff --git a/Root.js b/Root.js index 6c1fdbbdb..88486ce8d 100644 --- a/Root.js +++ b/Root.js @@ -98,7 +98,7 @@ } catch (err) { - console.log(logDisplace + "Root : [ERROR] initialize -> err.message = " + err.message); + console.log(logDisplace + "Root : [ERROR] initialize -> err = " + err.stack); return; } } @@ -123,9 +123,6 @@ const TRADING_ENGINE_MAIN_LOOP_MODULE = require('./TradingEngineProcessMainLoop'); /* Loop through all the processes configured to be run by this Node.js Instance. */ - - let cloneToExecute = global.EXECUTION_CONFIG.cloneToExecute; - /* Now we will read the config of the bot from the path we obtained at the Task Server config. */ let botConfig; @@ -154,7 +151,7 @@ try { botConfig = JSON.parse(text); - botConfig.repo = cloneToExecute.repo; + botConfig.repo = global.TASK_NODE.bot.processes[processIndex].code.repo; findProcess(processIndex); } catch (err) { console.log(logDisplace + "Root : [ERROR] start -> getBotConfig -> onInizialized -> onFileReceived -> err = " + JSON.stringify(err)); @@ -163,7 +160,7 @@ } } catch (err) { - console.log(logDisplace + "Root : [ERROR] start -> getBotConfig -> err.message = " + err.message); + console.log(logDisplace + "Root : [ERROR] start -> getBotConfig -> err = " + err.stack); return; } } @@ -173,7 +170,7 @@ try { if (FULL_LOG === true) { console.log(logDisplace + "Root : [INFO] start -> findProcess -> Entering function. "); } - botConfig.process = cloneToExecute.process; + botConfig.process = global.TASK_NODE.bot.processes[processIndex].code.process; botConfig.debug = {}; botConfig.processIndex = processIndex @@ -193,18 +190,13 @@ for (let i = 0; i < botConfig.processes.length; i++) { - if (botConfig.processes[i].name === cloneToExecute.process) { + if (botConfig.processes[i].name === global.TASK_NODE.bot.processes[processIndex].code.process) { processFound = true; - if (FULL_LOG === true) { console.log(logDisplace + "Root : [INFO] start -> findProcess -> Process found at the bot configuration file. -> cloneToExecute.process = " + cloneToExecute.process); } + if (FULL_LOG === true) { console.log(logDisplace + "Root : [INFO] start -> findProcess -> Process found at the bot configuration file. -> process = " + global.TASK_NODE.bot.processes[processIndex].code.process); } let processConfig = botConfig.processes[i]; - if (global.EXECUTION_CONFIG.timePeriod) { - processConfig.timePeriod = global.EXECUTION_CONFIG.timePeriod - } - - if (processConfig.framework !== undefined) { if (processConfig.framework.name === "Multi-Period-Daily" || processConfig.framework.name === "Multi-Period-Market" || processConfig.framework.name === "Multi-Period") { processConfig.framework.startDate.resumeExecution = true; @@ -397,7 +389,7 @@ } } catch (err) { - console.log(logDisplace + "Root : [ERROR] start -> findProcess -> Unexpected exception. -> err.message = " + err.message); + console.log(logDisplace + "Root : [ERROR] start -> findProcess -> Unexpected exception. -> err = " + err.stack); } } } @@ -405,7 +397,7 @@ if (processFound === false) { console.log(logDisplace + "Root : [ERROR] start -> findProcess -> Process listed at the configuration file of Task Server not found at the configuration file of the bot."); - console.log(logDisplace + "Root : [ERROR] start -> findProcess -> cloneToExecute.process = " + cloneToExecute.process); + console.log(logDisplace + "Root : [ERROR] start -> findProcess -> process = " + global.TASK_NODE.bot.processes[processIndex].code.process); } @@ -621,7 +613,7 @@ } } catch (err) { - console.log(logDisplace + "Root : [ERROR] start -> findProcess -> err.message = " + err.message); + console.log(logDisplace + "Root : [ERROR] start -> findProcess -> err = " + err.stack); exitProcessInstance() } } diff --git a/SensorBotProcessMainLoop.js b/SensorBotProcessMainLoop.js index 8360236c6..464793ae9 100644 --- a/SensorBotProcessMainLoop.js +++ b/SensorBotProcessMainLoop.js @@ -44,7 +44,7 @@ if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err.message = " + err.message); + parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err = " + err.stack); callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } @@ -189,7 +189,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -263,7 +263,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -359,7 +359,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -372,7 +372,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeUserBot -> onInizialized > Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -489,7 +489,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -502,7 +502,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startUserBot -> onFinished > Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -672,7 +672,7 @@ stopCallBack(); } } catch (err) { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); diff --git a/StatusDependencies.js b/StatusDependencies.js index 75b273431..ae1230e2c 100644 --- a/StatusDependencies.js +++ b/StatusDependencies.js @@ -66,7 +66,7 @@ } case "Status Report was never created.": { - logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> err.message = " + err.message); + logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> err = " + err.stack); logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> Report Not Found. -> bot = " + pStatusDependenciesConfig[i].bot); logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> Report Not Found. -> process = " + pStatusDependenciesConfig[i].process); addReport(); @@ -75,7 +75,7 @@ case "Status Report is corrupt.": { - logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> err.message = " + err.message); + logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> err = " + err.stack); logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> Report Not Found. -> bot = " + pStatusDependenciesConfig[i].bot); logger.write(MODULE_NAME, "[WARN] initialize -> onLoad -> Report Not Found. -> process = " + pStatusDependenciesConfig[i].process); addReport(); diff --git a/TradingEngineProcessMainLoop.js b/TradingEngineProcessMainLoop.js index f99b02df4..8d84f7e5d 100644 --- a/TradingEngineProcessMainLoop.js +++ b/TradingEngineProcessMainLoop.js @@ -48,7 +48,7 @@ if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err.message = " + err.message); + parentLogger.write(MODULE_NAME, "[ERROR] initialize -> onInizialized -> onBotDownloaded -> err = " + err.stack); callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } @@ -146,12 +146,35 @@ /* We are going to run the Definition comming at the event. */ global.DEFINITION = JSON.parse(message.event.definition) + if (global.DEFINITION.personalData) { + if (global.DEFINITION.personalData.exchangeAccounts) { + if (global.DEFINITION.personalData.exchangeAccounts.length > 0) { + let exchangeAccount = global.DEFINITION.personalData.exchangeAccounts[0] + if (exchangeAccount.keys) { + if (exchangeAccount.keys.length > 0) { + let key = exchangeAccount.keys[0] + + process.env.KEY = key.name + process.env.SECRET = key.code + + } + } + } + } + } + + if (process.env.KEY === undefined || process.env.SECRET === undefined) { + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[WARN] run -> startLiveTrading -> Key name or Secret not provided, not possible to run the process in Live mode."); } + return + } + bot.startMode = "Live" processConfig.framework.startDate.fixedDate = new Date() processConfig.framework.startDate.resumeExecution = false; bot.multiPeriodDailyProcessDatetime = processConfig.framework.startDate.fixedDate global.STOP_PROCESSING = false bot.hasTheBotJustStarted = true + } function stopRequested() { @@ -268,7 +291,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeStatusDependencies -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -342,7 +365,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeDataDependencies -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -415,7 +438,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeContext -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeContext -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeContext -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -489,7 +512,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeExchangeAPI -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -596,7 +619,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeAssistant -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeAssistant -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> initializeAssistant -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -682,7 +705,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized > Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized > Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -695,7 +718,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> intitializeProcessFramework -> onInizialized -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -814,7 +837,7 @@ return; } default: { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled custom response received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled custom response received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); @@ -827,7 +850,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> startProcessFramework -> onFinished -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -904,7 +927,7 @@ } default: { logger.write(MODULE_NAME, "[ERROR] run -> loop -> saveContext -> onFinished -> Unhandled err.result received. -> err.result = " + err.result); - logger.write(MODULE_NAME, "[ERROR] run -> loop -> saveContext -> onFinished -> Unhandled err.result received. -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> saveContext -> onFinished -> Unhandled err.result received. -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); @@ -1051,7 +1074,7 @@ stopCallBack(); } } catch (err) { - logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err.message = " + err.message); + logger.write(MODULE_NAME, "[ERROR] run -> loop -> shallWeStop -> err = " + err.stack); logger.persist(); clearInterval(fixedTimeLoopIntervalHandle); clearTimeout(nextLoopTimeoutHandle); diff --git a/server.js b/server.js index b0f32d97b..c4d5f9f20 100644 --- a/server.js +++ b/server.js @@ -216,24 +216,6 @@ function startSequence() { execution.exchangeName ? global.EXCHANGE_NAME = execution.exchangeName : undefined; - if (global.DEFINITION) { - if (global.DEFINITION.personalData) { - if (global.DEFINITION.personalData.exchangeAccounts) { - if (global.DEFINITION.personalData.exchangeAccounts.length > 0) { - let exchangeAccount = global.DEFINITION.personalData.exchangeAccounts[0] - if (exchangeAccount.keys) { - if (exchangeAccount.keys.length > 0) { - let key = exchangeAccount.keys[0] - - process.env.KEY = key.name - process.env.SECRET = key.code - - } - } - } - } - } - } readExecutionConfiguration(execution, processIndex); } @@ -303,18 +285,6 @@ async function readExecutionConfiguration(execution, processIndex) { } if (botProcess === undefined) { botProcess = process.env.PROCESS } // Only use the .env when nothing comes at Definition.json - let cloneToExecute = { - enabled: "true", - devTeam: global.TASK_NODE.bot.processes[processIndex].code.team, - bot: global.TASK_NODE.bot.processes[processIndex].code.bot, - process: global.TASK_NODE.bot.processes[processIndex].code.process, - repo: global.TASK_NODE.bot.processes[processIndex].code.repo - } - - global.EXECUTION_CONFIG = { - cloneToExecute: cloneToExecute - }; - global.CLONE_EXECUTOR = { codeName: 'AACloud', @@ -330,39 +300,6 @@ async function readExecutionConfiguration(execution, processIndex) { } } - -function getTimePeriod(timePeriod) { - if (timePeriod !== undefined) { - try { - let timePeriodMap = new Map() - timePeriodMap.set('24-hs', 86400000) - timePeriodMap.set('12-hs', 43200000) - timePeriodMap.set('08-hs', 28800000) - timePeriodMap.set('06-hs', 21600000) - timePeriodMap.set('04-hs', 14400000) - timePeriodMap.set('03-hs', 10800000) - timePeriodMap.set('02-hs', 7200000) - timePeriodMap.set('01-hs', 3600000) - timePeriodMap.set('45-min', 2700000) - timePeriodMap.set('40-min', 2400000) - timePeriodMap.set('30-min', 1800000) - timePeriodMap.set('20-min', 1200000) - timePeriodMap.set('15-min', 900000) - timePeriodMap.set('10-min', 600000) - timePeriodMap.set('05-min', 300000) - timePeriodMap.set('04-min', 240000) - timePeriodMap.set('03-min', 180000) - timePeriodMap.set('02-min', 120000) - timePeriodMap.set('01-min', 60000) - return timePeriodMap.get(timePeriod) - } catch (error) { - console.log('[WARN] Task Server -> server -> readExecutionConfiguration -> getTimePeriod -> Error: ', error) - } - } else { - return undefined - } -} - function startRoot(processIndex) { console.log('[INFO] Task Server -> server -> startRoot -> Entering function. ')