diff --git a/TaskServer/.env b/TaskServer/.env index ccfd1e3ba..cde9d6e81 100644 --- a/TaskServer/.env +++ b/TaskServer/.env @@ -1,6 +1,7 @@ INTER_PROCESS_FILES_PATH=../Inter-Process-Files STORAGE_PATH=../Data-Storage +PROJECTS_PATH=../Projects USE_KEYVAULT=false WRITE_LOGS_TO_FILES=true diff --git a/TaskServer/ProcessExecutionEvents.js b/TaskServer/ProcessExecutionEvents.js index 766f2a71f..27881f58b 100644 --- a/TaskServer/ProcessExecutionEvents.js +++ b/TaskServer/ProcessExecutionEvents.js @@ -97,50 +97,53 @@ for (let i = 0; i < network.networkNodes.length; i++) { let networkNode = network.networkNodes[i] if (networkNode.dataTasks !== undefined) { - for (let j = 0; j < networkNode.dataTasks.exchangeDataTasks.length; j++) { - let exchangeTasks = networkNode.dataTasks.exchangeDataTasks[j] - for (let p = 0; p < exchangeTasks.marketDataTasks.length; p++) { - let marketTasks = exchangeTasks.marketDataTasks[p] - if (marketTasks.referenceParent === undefined) { continue } - if (marketTasks.referenceParent.id !== global.MARKET_NODE.id) { continue } - for (let q = 0; q < marketTasks.dataMineTasks.length; q++) { - let mineTasks = marketTasks.dataMineTasks[q] - for (let k = 0; k < mineTasks.taskManagers.length; k++) { - let taskManager = mineTasks.taskManagers[k] - for (let m = 0; m < taskManager.tasks.length; m++) { - let task = taskManager.tasks[m] - if (task.bot !== undefined) { - for (let n = 0; n < task.bot.processes.length; n++) { - let process = task.bot.processes[n] - if (process.referenceParent !== undefined) { - let processDefinition = process.referenceParent - if (processThisDependsOn.id === processDefinition.id) { - /* - We found where the task that runs the process definition - we are waiting for is located on the network. - */ - thisObject.networkNode = networkNode - if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { - logger.write(MODULE_NAME, - "[INFO] initialize -> Connecting to Websockets Server " + networkNode.name + - " -> host = " + networkNode.config.host + - ' -> port = ' + networkNode.config.webSocketsPort + '.'); - } - - eventServerClient = EVENT_SERVER_CLIENT.newEventsServerClient(networkNode.config.host, networkNode.config.webSocketsPort) - eventServerClient.initialize(onConnected) - - function onConnected() { + for (let z = 0; z < networkNode.dataTasks.projectDataTasks.length; z++) { + let projectDataTasks = networkNode.dataTasks.projectDataTasks[z] + for (let j = 0; j < projectDataTasks.exchangeDataTasks.length; j++) { + let exchangeTasks = projectDataTasks.exchangeDataTasks[j] + for (let p = 0; p < exchangeTasks.marketDataTasks.length; p++) { + let marketTasks = exchangeTasks.marketDataTasks[p] + if (marketTasks.referenceParent === undefined) { continue } + if (marketTasks.referenceParent.id !== global.MARKET_NODE.id) { continue } + for (let q = 0; q < marketTasks.dataMineTasks.length; q++) { + let mineTasks = marketTasks.dataMineTasks[q] + for (let k = 0; k < mineTasks.taskManagers.length; k++) { + let taskManager = mineTasks.taskManagers[k] + for (let m = 0; m < taskManager.tasks.length; m++) { + let task = taskManager.tasks[m] + if (task.bot !== undefined) { + for (let n = 0; n < task.bot.processes.length; n++) { + let process = task.bot.processes[n] + if (process.referenceParent !== undefined) { + let processDefinition = process.referenceParent + if (processThisDependsOn.id === processDefinition.id) { + /* + We found where the task that runs the process definition + we are waiting for is located on the network. + */ + thisObject.networkNode = networkNode if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { - logger.write(MODULE_NAME, "[INFO] initialize -> Connected to Websockets Server " + networkNode.name + + logger.write(MODULE_NAME, + "[INFO] initialize -> Connecting to Websockets Server " + networkNode.name + " -> host = " + networkNode.config.host + ' -> port = ' + networkNode.config.webSocketsPort + '.'); } - - callBackFunction(global.DEFAULT_OK_RESPONSE); + + eventServerClient = EVENT_SERVER_CLIENT.newEventsServerClient(networkNode.config.host, networkNode.config.webSocketsPort) + eventServerClient.initialize(onConnected) + + function onConnected() { + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { + logger.write(MODULE_NAME, "[INFO] initialize -> Connected to Websockets Server " + networkNode.name + + " -> host = " + networkNode.config.host + + ' -> port = ' + networkNode.config.webSocketsPort + '.'); + } + + callBackFunction(global.DEFAULT_OK_RESPONSE); + return + } return } - return } } }