X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.js;h=9220127ceaad763eaa85daea562cd6632d1b4033;hb=2e6f5966ecbefada47d60b1b53d21fe49be439a5;hp=7393626be78e39c2bf758dbf39ff79620f8e27c3;hpb=83ee6a8646c702a561ba62f009e819c566243b90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Configuration.js b/src/utils/Configuration.js
index 7393626b..9220127c 100644
--- a/src/utils/Configuration.js
+++ b/src/utils/Configuration.js
@@ -1,4 +1,5 @@
 const fs = require('fs');
+const Utils = require('./Utils');
 
 class Configuration {
   static configurationFile;
@@ -6,41 +7,31 @@ class Configuration {
   // Read the config file
   static getConfig() {
     if (!Configuration.configurationFile) {
-      Configuration.configurationFile = JSON.parse(fs.readFileSync('src/assets/config.json', 'utf8'));
+      Configuration.configurationFile = JSON.parse(fs.readFileSync('./src/assets/config.json', 'utf8'));
     }
     return Configuration.configurationFile;
   }
 
   static getStatisticsDisplayInterval() {
     // Read conf
-    return Configuration.getConfig().statisticsDisplayInterval;
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'statisticsDisplayInterval') ? Configuration.getConfig().statisticsDisplayInterval : 60;
   }
 
   static getAutoReconnectTimeout() {
     // Read conf
-    return Configuration.getConfig().hasOwnProperty('autoReconnectTimeout') ? Configuration.getConfig().autoReconnectTimeout : 10;
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectTimeout') ? Configuration.getConfig().autoReconnectTimeout : 10;
   }
 
   static getAutoReconnectMaxRetries() {
     // Read conf
-    return Configuration.getConfig().hasOwnProperty('autoReconnectMaxRetries') ? Configuration.getConfig().autoReconnectMaxRetries : -1;
+    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;
   }
@@ -50,25 +41,19 @@ class Configuration {
   }
 
   static getConsoleLog() {
-    return (Configuration.getConfig().hasOwnProperty('consoleLog') ? Configuration.getConfig().consoleLog : false);
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'consoleLog') ? Configuration.getConfig().consoleLog : false;
   }
 
-  static getLogFile() {
-    return (Configuration.getConfig().hasOwnProperty('logFile') ? Configuration.getConfig().logFile : 'combined.log');
+  static getLogLevel() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logLevel') ? Configuration.getConfig().logLevel : 'info';
   }
 
-  static getErrorFile() {
-    return (Configuration.getConfig().hasOwnProperty('errorFile') ? Configuration.getConfig().errorFile : 'error.log');
-  }
-
-  static getMeterValueInterval() {
-    // Read conf
-    return (Configuration.getChargingStationConfiguration().hasOwnProperty('meterValueInterval') ? Configuration.getChargingStationConfiguration().meterValueInterval * 1000 : 60000);
+  static getLogFile() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFile') ? Configuration.getConfig().logFile : 'combined.log';
   }
 
-  static getAutomaticTransactionConfiguration() {
-    // Read conf
-    return Configuration.getChargingStationTemplate().AutomaticTransactionGenerator;
+  static getErrorFile() {
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'errorFile') ? Configuration.getConfig().errorFile : 'error.log';
   }
 
   static getSupervisionURLs() {
@@ -76,24 +61,8 @@ class Configuration {
     return Configuration.getConfig().supervisionURLs;
   }
 
-  static getEquallySupervisionDistribution() {
-    return Configuration.getConfig().distributeStationToTenantEqually;
-  }
-
-  static getChargingStationConfiguration() {
-    return (Configuration.getChargingStationTemplate().hasOwnProperty('Configuration') ? Configuration.getChargingStationTemplate().Configuration : {});
-  }
-
-  static getChargingStationAuthorizationFile() {
-    return (Configuration.getChargingStationTemplate().hasOwnProperty('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;
   }
 }