diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index f7b376d80..54dfcc438 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -439,6 +439,12 @@ "propertyName": "fileStorage", "functionName": "newSuperalgosTaskModulesFileStorage", "fileName": "FileStorage.js" + }, + { + "name": "Debug Log", + "propertyName": "debugLog", + "functionName": "newSuperalgosTaskModulesDebugLog", + "fileName": "DebugLog.js" } ], "processModules": [ diff --git a/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js b/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js index 35b1d67c9..d03baf10c 100644 --- a/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js +++ b/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js @@ -8,8 +8,6 @@ let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex); - const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); - let nextLoopTimeoutHandle; let thisObject = { @@ -101,7 +99,7 @@ if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) { TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.finalize() } - TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex) + TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = TS.projects.superalgos.taskModules.debugLog.newSuperalgosTaskModulesDebugLog(processIndex) TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE) TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++; diff --git a/TaskServer/DebugLog.js b/Projects/Superalgos/TS/Task-Modules/DebugLog.js similarity index 99% rename from TaskServer/DebugLog.js rename to Projects/Superalgos/TS/Task-Modules/DebugLog.js index 693f9d0ff..8eafe8571 100644 --- a/TaskServer/DebugLog.js +++ b/Projects/Superalgos/TS/Task-Modules/DebugLog.js @@ -1,4 +1,4 @@ -exports.newDebugLog = function (processIndex) { +exports.newSuperalgosTaskModulesDebugLog = function (processIndex) { const MODULE_NAME = "DebugLog"; diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index 42c3683c0..7eda018d7 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -10,8 +10,6 @@ let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex); - const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); - let nextLoopTimeoutHandle; let thisObject = { @@ -96,7 +94,7 @@ if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) { TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.finalize() } - TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex) + TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = TS.projects.superalgos.taskModules.debugLog.newSuperalgosTaskModulesDebugLog(processIndex) TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE) TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++; diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index 142fd9bab..c9ae3a280 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -16,7 +16,6 @@ const INDICATOR_BOT_MODULE = require('./IndicatorBot'); const TRADING_BOT_MODULE = require('./TradingBot'); - const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); let botInstance @@ -29,7 +28,7 @@ */ VARIABLES_BY_PROCESS_INDEX = { LOGS_TO_DELETE_QUEUE: [], - PROCESS_INSTANCE_LOGGER_MODULE: DEBUG_MODULE.newDebugLog(processIndex) + PROCESS_INSTANCE_LOGGER_MODULE: TS.projects.superalgos.taskModules.debugLog.newSuperalgosTaskModulesDebugLog(processIndex) } TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.set(processIndex, VARIABLES_BY_PROCESS_INDEX) /* We will add the process id to its key so that it is unique and it can later be finalized. */ diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index 0ea2c68fe..459557c51 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -10,8 +10,6 @@ let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex); let session = SESSION.newTradingSession(processIndex) - const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); - let nextLoopTimeoutHandle; let thisObject = { @@ -58,7 +56,7 @@ if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) { TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.finalize() } - TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex) + TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = TS.projects.superalgos.taskModules.debugLog.newSuperalgosTaskModulesDebugLog(processIndex) TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE) TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++;