From 29a2fb56eb2bada0a73459015adb43cb90083adc Mon Sep 17 00:00:00 2001
From: Matias <mati108@gmail.com>
Date: Fri, 22 Mar 2019 19:15:34 +0100
Subject: [PATCH] Moving to paramaters to bot config

---
 Root.js |  6 ++++--
 Run.js  | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Root.js b/Root.js
index f2c4737fb..23f587d6a 100644
--- a/Root.js
+++ b/Root.js
@@ -345,8 +345,8 @@
                             switch (global.CURRENT_EXECUTION_AT) {
                                 case "Cloud": {
                                     processConfig.startMode = global.EXECUTION_CONFIG.startMode // Override file storage configuration
-                                    if(global.TIME_PERIOD){
-                                        processConfig.timePeriod = global.TIME_PERIOD
+                                    if(global.EXECUTION_CONFIG.timePeriod){
+                                        processConfig.timePeriod = global.EXECUTION_CONFIG.timePeriod
                                     }
                                     break;
                                 }
@@ -865,6 +865,8 @@
 
                                 logger = DEBUG_MODULE.newDebugLog();
                                 logger.bot = pBotConfig;
+                                pBotConfig.timePeriodFileStorage = global.EXECUTION_CONFIG.timePeriodFileStorage
+                                pBotConfig.dataSet = global.EXECUTION_CONFIG.dataSet
 
                                 if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> findProcess -> runTradingBot -> createBotInstance -> Entering function."); }
 
diff --git a/Run.js b/Run.js
index 0610f0498..be015b060 100644
--- a/Run.js
+++ b/Run.js
@@ -123,7 +123,9 @@ function readExecutionConfiguration() {
         global.EXECUTION_CONFIG = {
             executionList: executionList,
             startMode: startMode,
-            timePeriod: getTimePeriod()
+            timePeriod: getTimePeriod(process.env.TIME_PERIOD),
+            timePeriodFileStorage: process.env.TIME_PERIOD,
+            dataSet: process.env.DATA_SET
         };
 
         readStoragePermissions();
@@ -136,8 +138,8 @@ function readExecutionConfiguration() {
     }
 }
 
-function getTimePeriod(){
-    if(process.env.TIME_PERIOD !== undefined){
+function getTimePeriod(timePeriod){
+    if(timePeriod !== undefined){
         try {
             let timePeriodMap = new Map()
             timePeriodMap.set("24-hs", 86400000)
@@ -159,7 +161,7 @@ function getTimePeriod(){
             timePeriodMap.set("03-min", 180000)
             timePeriodMap.set("02-min", 120000)
             timePeriodMap.set("01-min", 60000)
-            return timePeriodMap.get(process.env.TIME_PERIOD)
+            return timePeriodMap.get(timePeriod)
         } catch (error) {
             console.log( "[WARN] Run -> readExecutionConfiguration -> getTimePeriod -> Error: ", error);
         }