X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.js;h=3227cb0ce660d2bb2eeb2e5eaef9514f4aa417f3;hb=2328be1eb45cef063d1d56a2e948c50840af4735;hp=31ab1d6b561e0e61abdd1159518351e62a67995a;hpb=1d7ca20ccc95d325e520291fd2596df9d391536b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Configuration.js b/src/utils/Configuration.js
index 31ab1d6b..3227cb0c 100644
--- a/src/utils/Configuration.js
+++ b/src/utils/Configuration.js
@@ -2,19 +2,19 @@ const fs = require('fs');
 const Utils = require('./Utils');
 
 class Configuration {
-  static configurationFile;
+  static configuration;
 
   // Read the config file
   static getConfig() {
-    if (!Configuration.configurationFile) {
-      Configuration.configurationFile = JSON.parse(fs.readFileSync('./src/assets/config.json', 'utf8'));
+    if (!Configuration.configuration) {
+      Configuration.configuration = JSON.parse(fs.readFileSync('./src/assets/config.json', 'utf8'));
     }
-    return Configuration.configurationFile;
+    return Configuration.configuration;
   }
 
   static getStatisticsDisplayInterval() {
     // Read conf
-    return Configuration.getConfig().statisticsDisplayInterval;
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'statisticsDisplayInterval') ? Configuration.getConfig().statisticsDisplayInterval : 60;
   }
 
   static getAutoReconnectTimeout() {
@@ -27,21 +27,11 @@ class Configuration {
     return Utils.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectMaxRetries') ? Configuration.getConfig().autoReconnectMaxRetries : -1;
   }
 
-  static getChargingStationTemplateURLs() {
+  static getStationTemplateURLs() {
     // Read conf
     return Configuration.getConfig().stationTemplateURLs;
   }
 
-  static getChargingStationTemplate() {
-    // Read conf
-    return Configuration.getConfig().stationTemplate;
-  }
-
-  static getNumberofChargingStation() {
-    // Read conf
-    return Configuration.getConfig().numberOfStation ? Configuration.getConfig().numberOfStation : 0;
-  }
-
   static useWorkerPool() {
     return Configuration.getConfig().useWorkerPool;
   }
@@ -54,6 +44,14 @@ class Configuration {
     return Utils.objectHasOwnProperty(Configuration.getConfig(), 'consoleLog') ? Configuration.getConfig().consoleLog : false;
   }
 
+  static getLogFormat() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFormat') ? Configuration.getConfig().logFormat : 'simple';
+  }
+
+  static getLogLevel() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logLevel') ? Configuration.getConfig().logLevel : 'info';
+  }
+
   static getLogFile() {
     return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFile') ? Configuration.getConfig().logFile : 'combined.log';
   }
@@ -62,34 +60,13 @@ class Configuration {
     return Utils.objectHasOwnProperty(Configuration.getConfig(), 'errorFile') ? Configuration.getConfig().errorFile : 'error.log';
   }
 
-  static getAutomaticTransactionConfiguration() {
-    // Read conf
-    return Configuration.getChargingStationTemplate().AutomaticTransactionGenerator;
-  }
-
   static getSupervisionURLs() {
     // Read conf
     return Configuration.getConfig().supervisionURLs;
   }
 
-  static getEquallySupervisionDistribution() {
-    return Configuration.getConfig().distributeStationToTenantEqually;
-  }
-
-  static getChargingStationConfiguration() {
-    return Utils.objectHasOwnProperty(Configuration.getChargingStationTemplate(), 'Configuration') ? Configuration.getChargingStationTemplate().Configuration : {};
-  }
-
-  static getChargingStationAuthorizationFile() {
-    return Utils.objectHasOwnProperty(Configuration.getChargingStationTemplate(), 'authorizationFile') ? Configuration.getChargingStationTemplate().authorizationFile : '';
-  }
-
-  static getChargingStationConnectors() {
-    return Configuration.getChargingStationTemplate().Connectors;
-  }
-
-  static getChargingStationConnector(number) {
-    return Configuration.getChargingStationTemplate().Connectors[number];
+  static getDistributeStationToTenantEqually() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'distributeStationToTenantEqually') ? Configuration.getConfig().distributeStationToTenantEqually : true;
   }
 }