From 84a18c7e775ee17bcc765b5dfb49c1835f23448e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 1 Dec 2020 13:33:46 +0100 Subject: [PATCH] FILE_STORAGE.newFileStorage(processIndex, --- .../Multi-Period-Daily/User.Bot.js | 2 +- .../Multi-Period-Market/User.Bot.js | 2 +- .../Multi-Period-Daily/User.Bot.js | 2 +- .../Multi-Period-Market/User.Bot.js | 2 +- .../Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js | 2 +- .../Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js | 2 +- .../bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js | 2 +- TaskServer/Commons.js | 2 +- TaskServer/DataSet.js | 2 +- TaskServer/DebugLog.js | 2 +- TaskServer/FileStorage.js | 2 +- TaskServer/IndicatorBot.js | 2 +- TaskServer/IndicatorOutput.js | 2 +- TaskServer/LowFrequencyTrading/Snapshots.js | 2 +- TaskServer/LowFrequencyTrading/TradingOutput.js | 2 +- TaskServer/LowFrequencyTrading/TradingProcess.js | 2 +- TaskServer/MultiPeriodDaily.js | 2 +- TaskServer/MultiPeriodMarket.js | 2 +- TaskServer/ReinforcementLearning/LearningBot.js | 2 +- TaskServer/SensorBot.js | 2 +- TaskServer/StatusReport.js | 4 ++-- TaskServer/TradingBot.js | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js index c16ee8b84..4a0fa6c79 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js @@ -21,7 +21,7 @@ }; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies; let beginingOfMarket diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js index 8af6cedb5..4e85f02bc 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js @@ -18,7 +18,7 @@ let statusDependencies; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); return thisObject; diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js index 3b5154ea8..ee8274178 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js @@ -23,7 +23,7 @@ }; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies; let beginingOfMarket diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js index 5bdc80119..fb0c5a232 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js @@ -23,7 +23,7 @@ }; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies; let beginingOfMarket diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js index 2a5db51a2..9ff7e8f3e 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js @@ -13,7 +13,7 @@ exports.newUserBot = function (processIndex, COMMONS, UTILITIES, FILE_STORAGE, S }; let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies const ONE_MIN = 60000 diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js index 0af31a116..5f1814769 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js @@ -14,7 +14,7 @@ exports.newUserBot = function (processIndex, COMMONS, UTILITIES, FILE_STORAGE, S }; let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies const ONE_MINUTE = 60000 diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js index ec580887c..a2c0d4855 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js @@ -12,7 +12,7 @@ exports.newUserBot = function (processIndex, COMMONS, UTILITIES, FILE_STORAGE, S }; let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let statusDependencies return thisObject; diff --git a/TaskServer/Commons.js b/TaskServer/Commons.js index 34eff6807..e96590e82 100644 --- a/TaskServer/Commons.js +++ b/TaskServer/Commons.js @@ -13,7 +13,7 @@ }; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); return thisObject; diff --git a/TaskServer/DataSet.js b/TaskServer/DataSet.js index bc33655fc..dc56f9c96 100644 --- a/TaskServer/DataSet.js +++ b/TaskServer/DataSet.js @@ -91,7 +91,7 @@ exports.newDataSet = function (processIndex) { /* We found where the data is located on the network. */ TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.write(MODULE_NAME, "[INFO] initialize -> Retrieving data from " + networkNode.name + " -> host = " + networkNode.config.host + ' -> port = ' + networkNode.config.webPort + '.') - fileStorage = FILE_STORAGE.newFileStorage(networkNode.config.host, networkNode.config.webPort); + fileStorage = FILE_STORAGE.newFileStorage(processIndex, networkNode.config.host, networkNode.config.webPort); callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE, true); } catch (err) { diff --git a/TaskServer/DebugLog.js b/TaskServer/DebugLog.js index a1892f3b6..7ce7b2a0a 100644 --- a/TaskServer/DebugLog.js +++ b/TaskServer/DebugLog.js @@ -94,7 +94,7 @@ exports.newDebugLog = function (processIndex) { accumulatedLog = "["; const FILE_STORAGE = require('./FileStorage.js'); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let filePath = TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).FILE_PATH_ROOT + "/Logs/" + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.config.codeName + "/" diff --git a/TaskServer/FileStorage.js b/TaskServer/FileStorage.js index b59f9bd44..9d03730a2 100644 --- a/TaskServer/FileStorage.js +++ b/TaskServer/FileStorage.js @@ -1,7 +1,7 @@ const path = require('path') -exports.newFileStorage = function newFileStorage(host, port) { +exports.newFileStorage = function newFileStorage(processIndex, host, port) { const MODULE_NAME = 'FileStorage' const MAX_RETRY = 10 diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index 017e86824..a4669b53e 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -8,7 +8,7 @@ const MULTI_PERIOD_MARKET = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'MultiPeriodMarket'); const MULTI_PERIOD_DAILY = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'MultiPeriodDaily'); const FILE_STORAGE = require('./FileStorage.js'); - let fileStorage = FILE_STORAGE.newFileStorage(TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); diff --git a/TaskServer/IndicatorOutput.js b/TaskServer/IndicatorOutput.js index 49aec1370..1bd318da0 100644 --- a/TaskServer/IndicatorOutput.js +++ b/TaskServer/IndicatorOutput.js @@ -8,7 +8,7 @@ }; let utilities = UTILITIES.newCloudUtilities(); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); const COMMONS = require('./Commons.js'); let commons = COMMONS.newCommons(UTILITIES, FILE_STORAGE); diff --git a/TaskServer/LowFrequencyTrading/Snapshots.js b/TaskServer/LowFrequencyTrading/Snapshots.js index f6cda507a..b1c03c5dc 100644 --- a/TaskServer/LowFrequencyTrading/Snapshots.js +++ b/TaskServer/LowFrequencyTrading/Snapshots.js @@ -295,7 +295,7 @@ exports.newSnapshots = function (processIndex) { function writeSnapshotFile(snapshotArray, pFileName) { try { const FILE_STORAGE = require('../FileStorage.js'); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); let fileContent = ""; let separator = "\r\n"; diff --git a/TaskServer/LowFrequencyTrading/TradingOutput.js b/TaskServer/LowFrequencyTrading/TradingOutput.js index c3945113c..702fd5575 100644 --- a/TaskServer/LowFrequencyTrading/TradingOutput.js +++ b/TaskServer/LowFrequencyTrading/TradingOutput.js @@ -12,7 +12,7 @@ exports.newTradingOutput = function (processIndex, tradingEngineModule, UTILITIE } let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage() + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ) return thisObject diff --git a/TaskServer/LowFrequencyTrading/TradingProcess.js b/TaskServer/LowFrequencyTrading/TradingProcess.js index 5826e9a09..3cfda833b 100644 --- a/TaskServer/LowFrequencyTrading/TradingProcess.js +++ b/TaskServer/LowFrequencyTrading/TradingProcess.js @@ -21,7 +21,7 @@ let multiPeriodDataFiles = new Map(); const FILE_STORAGE = require('../FileStorage.js'); - let fileStorage = FILE_STORAGE.newFileStorage(); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ); const TRADING_ENGINE_MODULE = require('./TradingEngine.js') let tradingEngineModule = TRADING_ENGINE_MODULE.newTradingEngine(processIndex) diff --git a/TaskServer/MultiPeriodDaily.js b/TaskServer/MultiPeriodDaily.js index 0ef61e79d..7a11a828b 100644 --- a/TaskServer/MultiPeriodDaily.js +++ b/TaskServer/MultiPeriodDaily.js @@ -9,7 +9,7 @@ }; let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage() + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ) let statusDependencies; let dataDependenciesModule; diff --git a/TaskServer/MultiPeriodMarket.js b/TaskServer/MultiPeriodMarket.js index bb91c4ba6..ef547373d 100644 --- a/TaskServer/MultiPeriodMarket.js +++ b/TaskServer/MultiPeriodMarket.js @@ -7,7 +7,7 @@ }; let utilities = UTILITIES.newCloudUtilities() - let fileStorage = FILE_STORAGE.newFileStorage() + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, ) let statusDependencies; let dataDependenciesModule; diff --git a/TaskServer/ReinforcementLearning/LearningBot.js b/TaskServer/ReinforcementLearning/LearningBot.js index dbacef14b..179984674 100644 --- a/TaskServer/ReinforcementLearning/LearningBot.js +++ b/TaskServer/ReinforcementLearning/LearningBot.js @@ -7,7 +7,7 @@ exports.newLearningBot = function (processIndex, parentLogger) { const FILE_STORAGE = require('./FileStorage.js'); const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession'); - let fileStorage = FILE_STORAGE.newFileStorage(parentLogger); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, parentLogger); let session = SESSION.newLearningSession(processIndex, parentLogger) const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js index 62ffbdf0c..325a0cc76 100644 --- a/TaskServer/SensorBot.js +++ b/TaskServer/SensorBot.js @@ -6,7 +6,7 @@ let COMMONS_MODULE; const FILE_STORAGE = require('./FileStorage.js'); - let fileStorage = FILE_STORAGE.newFileStorage(TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); diff --git a/TaskServer/StatusReport.js b/TaskServer/StatusReport.js index 0a42a96e2..c52211d2e 100644 --- a/TaskServer/StatusReport.js +++ b/TaskServer/StatusReport.js @@ -153,7 +153,7 @@ thisObject.networkNode = networkNode TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.write(MODULE_NAME, "[INFO] initialize -> Retrieving status report from " + networkNode.name + " -> host = " + networkNode.config.host + ' -> port = ' + networkNode.config.webPort + '.') - fileStorage = FILE_STORAGE.newFileStorage(networkNode.config.host, networkNode.config.webPort) + fileStorage = FILE_STORAGE.newFileStorage(processIndex, networkNode.config.host, networkNode.config.webPort) callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE) return true } @@ -204,7 +204,7 @@ thisObject.networkNode = networkNode TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.write(MODULE_NAME, "[INFO] initialize -> Retrieving status report from " + networkNode.name + " -> host = " + networkNode.config.host + ' -> port = ' + networkNode.config.webPort + '.') - fileStorage = FILE_STORAGE.newFileStorage(networkNode.config.host, networkNode.config.webPort) + fileStorage = FILE_STORAGE.newFileStorage(processIndex, networkNode.config.host, networkNode.config.webPort) callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE) return true } diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index 249223982..d00ef0d50 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -7,7 +7,7 @@ const FILE_STORAGE = require('./FileStorage.js'); const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession'); - let fileStorage = FILE_STORAGE.newFileStorage(TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); + let fileStorage = FILE_STORAGE.newFileStorage(processIndex, TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE); let session = SESSION.newTradingSession(processIndex) const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog');