diff --git a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js index e04ada915..d3fd57b92 100644 --- a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js +++ b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js @@ -37,7 +37,7 @@ exports.newSuperalgosFunctionLibrariesNodeJSFunctions = function () { setTimeout(process.exit, 10000) // We will give 10 seconds to logs be written on file function finalizeLoggers() { - global.LOGGER_MAP.forEach(forEachLogger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.forEach(forEachLogger) function forEachLogger(logger) { if (logger !== undefined) { diff --git a/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js b/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js index bf9539ab1..7645515d0 100644 --- a/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js +++ b/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js @@ -21,7 +21,7 @@ exports.newSuperalgosFunctionLibrariesSessionFunctions = function () { } function finalizeSessions () { - global.SESSION_MAP.forEach(forEachSession) + TS.projects.superalgos.globals.taskVariables.SESSION_MAP.forEach(forEachSession) function forEachSession(session) { global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(session, 'Stopped') diff --git a/Projects/Superalgos/TS/Globals/TaskVariables.js b/Projects/Superalgos/TS/Globals/TaskVariables.js index 0eb89594c..76d64ae80 100644 --- a/Projects/Superalgos/TS/Globals/TaskVariables.js +++ b/Projects/Superalgos/TS/Globals/TaskVariables.js @@ -4,7 +4,9 @@ exports.newSuperalgosGlobalsTaskVariables = function () { we turn on this switch that will signal every internal procedure that it must stop. */ let thisObject = { - IS_TASK_STOPPING: false + IS_TASK_STOPPING: false, + LOGGER_MAP: new Map(), // We will put all the loggers in a map, so that we can eventually finalize them. + SESSION_MAP: new Map() // We will put all the sessions in a map, so that we can eventually finalize them. } return thisObject diff --git a/TaskServer/Globals.js b/TaskServer/Globals.js deleted file mode 100644 index bcc96280f..000000000 --- a/TaskServer/Globals.js +++ /dev/null @@ -1,15 +0,0 @@ -exports.newGlobals = function () { - - let thisObject = { - initialize: initialize - } - - return thisObject; - - function initialize() { - - global.LOGGER_MAP = new Map() // We will put all the loggers in a map, so that we can eventually finalize them. - global.SESSION_MAP = new Map() // We will put all the sessions in a map, so that we can eventually finalize them. - - } -} \ No newline at end of file diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index f0f5ce2c3..5d017a8db 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -107,7 +107,7 @@ logger.finalize() } logger = DEBUG_MODULE.newDebugLog(); - global.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) logger.bot = bot; logger.initialize(); diff --git a/TaskServer/LearningSession.js b/TaskServer/LearningSession.js index 85d9754f1..85743af61 100644 --- a/TaskServer/LearningSession.js +++ b/TaskServer/LearningSession.js @@ -35,7 +35,7 @@ exports.newLearningSession = function newLearningSession(bot, parentLogger) { /* Listen to event to start or stop the session. */ bot.sessionKey = bot.processNode.session.name + '-' + bot.processNode.session.type + '-' + bot.processNode.session.id - global.SESSION_MAP.set(bot.sessionKey, bot.sessionKey) + TS.projects.superalgos.globals.taskVariables.SESSION_MAP.set(bot.sessionKey, bot.sessionKey) global.EVENT_SERVER_CLIENT_MODULE.listenToEvent(bot.sessionKey, 'Learning Session Status', undefined, bot.sessionKey, undefined, onSessionStatus) global.EVENT_SERVER_CLIENT_MODULE.listenToEvent(bot.sessionKey, 'Run Learning Session', undefined, bot.sessionKey, undefined, onSessionRun) diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index 374a67d20..6412835ba 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -29,7 +29,7 @@ id to its key so that it is unique and it can later be finalized. */ let logger = DEBUG_MODULE.newDebugLog() - global.LOGGER_MAP.set('Pre-Bot-Main-Loop' + global.TASK_NODE.bot.processes[processIndex].id, logger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set('Pre-Bot-Main-Loop' + global.TASK_NODE.bot.processes[processIndex].id, logger) logger.bot = botConfig; botConfig.process = global.TASK_NODE.bot.processes[processIndex].referenceParent.config.codeName diff --git a/TaskServer/ReinforcementLearning/LearningBot.js b/TaskServer/ReinforcementLearning/LearningBot.js index ef615c33d..e7f82e666 100644 --- a/TaskServer/ReinforcementLearning/LearningBot.js +++ b/TaskServer/ReinforcementLearning/LearningBot.js @@ -64,7 +64,7 @@ exports.newLearningBot = function newLearningBot(processIndex, bot, parentLogger logger.finalize() } logger = DEBUG_MODULE.newDebugLog(); - global.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) logger.bot = bot; logger.initialize(); diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js index fad6e552d..147afd604 100644 --- a/TaskServer/SensorBot.js +++ b/TaskServer/SensorBot.js @@ -114,7 +114,7 @@ logger.finalize() } logger = DEBUG_MODULE.newDebugLog(); - global.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) logger.bot = bot; logger.initialize(); diff --git a/TaskServer/Task.js b/TaskServer/Task.js index b5f31da6a..d1b14632e 100644 --- a/TaskServer/Task.js +++ b/TaskServer/Task.js @@ -1,7 +1,3 @@ -let GLOBALS = require('./Globals.js'); -let GLOBALS_MODULE = GLOBALS.newGlobals() -GLOBALS_MODULE.initialize() - let NODE_JS_PROCESS = require('./NodeJsProcess.js'); let NODE_JS_PROCESS_MODULE = NODE_JS_PROCESS.newNodeJsProcess() NODE_JS_PROCESS_MODULE.initialize() diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index 2d2c547ec..7ab94b0cb 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -64,7 +64,7 @@ logger.finalize() } logger = DEBUG_MODULE.newDebugLog(); - global.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) + TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + global.TASK_NODE.bot.processes[processIndex].id, logger) logger.bot = bot; logger.initialize(); diff --git a/TaskServer/TradingSession.js b/TaskServer/TradingSession.js index 549b3ed20..2ad296188 100644 --- a/TaskServer/TradingSession.js +++ b/TaskServer/TradingSession.js @@ -35,7 +35,7 @@ /* Listen to event to start or stop the session. */ bot.TRADING_SESSIONKey = bot.processNode.session.name + '-' + bot.processNode.session.type + '-' + bot.processNode.session.id - global.SESSION_MAP.set(bot.TRADING_SESSIONKey, bot.TRADING_SESSIONKey) + TS.projects.superalgos.globals.taskVariables.SESSION_MAP.set(bot.TRADING_SESSIONKey, bot.TRADING_SESSIONKey) global.EVENT_SERVER_CLIENT_MODULE.listenToEvent(bot.TRADING_SESSIONKey, 'Trading Session Status', undefined, bot.TRADING_SESSIONKey, undefined, onSessionStatus) global.EVENT_SERVER_CLIENT_MODULE.listenToEvent(bot.TRADING_SESSIONKey, 'Run Trading Session', undefined, bot.TRADING_SESSIONKey, undefined, onSessionRun)