X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=239ec9186310c2de9d2a6f94d78f8d75d99597f3;hb=bc0f4d8f4973f36baa3f468848fe4d7af25c9a9c;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..239ec918 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -4,44 +4,52 @@ import TransportType from 'winston/lib/winston/transports/index.js';
 import DailyRotateFile from 'winston-daily-rotate-file';
 
 import { Configuration } from './Configuration';
-import { Utils } from './Utils';
+import { insertAt } from './Utils';
+import { ConfigurationSection, type LogConfiguration } from '../types';
 
+const logConfiguration = Configuration.getConfigurationSection<LogConfiguration>(
+  ConfigurationSection.log,
+);
 let transports: transport[];
-if (Configuration.getLogRotate() === true) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
-  const logMaxSize = Configuration.getLogMaxSize();
+if (logConfiguration.rotate === true) {
+  const logMaxFiles = logConfiguration.maxFiles;
+  const logMaxSize = logConfiguration.maxSize;
   transports = [
     new DailyRotateFile({
-      filename: Utils.insertAt(
-        Configuration.getLogErrorFile(),
+      filename: insertAt(
+        logConfiguration.errorFile!,
         '-%DATE%',
-        Configuration.getLogErrorFile()?.indexOf('.log')
+        logConfiguration.errorFile!.indexOf('.log'),
       ),
       level: 'error',
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
     }),
     new DailyRotateFile({
-      filename: Utils.insertAt(
-        Configuration.getLogFile(),
-        '-%DATE%',
-        Configuration.getLogFile()?.indexOf('.log')
-      ),
+      filename: insertAt(logConfiguration.file!, '-%DATE%', logConfiguration.file!.indexOf('.log')),
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
     }),
   ];
 } else {
   transports = [
-    new TransportType.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new TransportType.File({ filename: Configuration.getLogFile() }),
+    new TransportType.File({
+      filename: logConfiguration.errorFile,
+      level: 'error',
+    }),
+    new TransportType.File({
+      filename: logConfiguration.file,
+    }),
   ];
 }
 
 export const logger = createLogger({
-  silent: !Configuration.getLogEnabled(),
-  level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as FormatWrap)()),
+  silent: !logConfiguration.enabled,
+  level: logConfiguration.level,
+  format: format.combine(
+    format.splat(),
+    (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)(),
+  ),
   transports,
 });
 
@@ -49,13 +57,13 @@ export const logger = createLogger({
 // If enabled, log to the `console` with the format:
 // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
 //
-if (Configuration.getLogConsole()) {
+if (logConfiguration.console) {
   logger.add(
     new TransportType.Console({
       format: format.combine(
         format.splat(),
-        (format[Configuration.getLogFormat()] as FormatWrap)()
+        (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)(),
       ),
-    })
+    }),
   );
 }