X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=92fe6909e3740aa932b133be1378de947347adff;hb=7c2c6fd37881dd238855cae4a0d0a21d0d44111a;hp=637beb5bd533bffe6f0fb91cc8124bef730ce381;hpb=ae389044af7cfc9661bc53658ea405f4f1ae84ae;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 637beb5b..92fe6909 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -7,15 +7,15 @@ import { Configuration } from './Configuration';
 import { Utils } from './Utils';
 
 let transports: transport[];
-if (Configuration.getLogRotate() === true) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
-  const logMaxSize = Configuration.getLogMaxSize();
+if (Configuration.getLog().rotate === true) {
+  const logMaxFiles = Configuration.getLog().maxFiles;
+  const logMaxSize = Configuration.getLog().maxSize;
   transports = [
     new DailyRotateFile({
       filename: Utils.insertAt(
-        Configuration.getLogErrorFile(),
+        Configuration.getLog().errorFile,
         '-%DATE%',
-        Configuration.getLogErrorFile()?.indexOf('.log')
+        Configuration.getLog().errorFile?.indexOf('.log')
       ),
       level: 'error',
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
@@ -23,9 +23,9 @@ if (Configuration.getLogRotate() === true) {
     }),
     new DailyRotateFile({
       filename: Utils.insertAt(
-        Configuration.getLogFile(),
+        Configuration.getLog().file,
         '-%DATE%',
-        Configuration.getLogFile()?.indexOf('.log')
+        Configuration.getLog().file?.indexOf('.log')
       ),
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
@@ -33,15 +33,15 @@ if (Configuration.getLogRotate() === true) {
   ];
 } else {
   transports = [
-    new TransportType.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new TransportType.File({ filename: Configuration.getLogFile() }),
+    new TransportType.File({ filename: Configuration.getLog().errorFile, level: 'error' }),
+    new TransportType.File({ filename: Configuration.getLog().file }),
   ];
 }
 
 export const logger = createLogger({
-  silent: !Configuration.getLogEnabled(),
-  level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as FormatWrap)()),
+  silent: !Configuration.getLog().enabled,
+  level: Configuration.getLog().level,
+  format: format.combine(format.splat(), (format[Configuration.getLog().format] as FormatWrap)()),
   transports,
 });
 
@@ -49,12 +49,12 @@ export const logger = createLogger({
 // If enabled, log to the `console` with the format:
 // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
 //
-if (Configuration.getLogConsole()) {
+if (Configuration.getLog().console) {
   logger.add(
     new TransportType.Console({
       format: format.combine(
         format.splat(),
-        (format[Configuration.getLogFormat()] as FormatWrap)()
+        (format[Configuration.getLog().format] as FormatWrap)()
       ),
     })
   );