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

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 637beb5b..b13ec047 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,61 +1,74 @@
-import type { FormatWrap } from 'logform';
-import { createLogger, format, type transport } from 'winston';
-import TransportType from 'winston/lib/winston/transports/index.js';
-import DailyRotateFile from 'winston-daily-rotate-file';
+import type { FormatWrap } from 'logform'
+import { createLogger, format, type transport } from 'winston'
+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 { ConfigurationSection, type LogConfiguration } from '../types/index.js'
+import { Configuration } from './Configuration.js'
+import { insertAt } from './Utils.js'
 
-let transports: transport[];
-if (Configuration.getLogRotate() === true) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
-  const logMaxSize = Configuration.getLogMaxSize();
+const logConfiguration = Configuration.getConfigurationSection<LogConfiguration>(
+  ConfigurationSection.log
+)
+let transports: transport[]
+if (logConfiguration.rotate === true) {
+  const logMaxFiles = logConfiguration.maxFiles
+  const logMaxSize = logConfiguration.maxSize
   transports = [
     new DailyRotateFile({
-      filename: Utils.insertAt(
-        Configuration.getLogErrorFile(),
+      filename: insertAt(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        logConfiguration.errorFile!,
         '-%DATE%',
-        Configuration.getLogErrorFile()?.indexOf('.log')
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        logConfiguration.errorFile!.indexOf('.log')
       ),
       level: 'error',
-      ...(logMaxFiles && { maxFiles: logMaxFiles }),
-      ...(logMaxSize && { maxSize: logMaxSize }),
+      ...(logMaxFiles != null && { maxFiles: logMaxFiles }),
+      ...(logMaxSize != null && { maxSize: logMaxSize })
     }),
     new DailyRotateFile({
-      filename: Utils.insertAt(
-        Configuration.getLogFile(),
-        '-%DATE%',
-        Configuration.getLogFile()?.indexOf('.log')
-      ),
-      ...(logMaxFiles && { maxFiles: logMaxFiles }),
-      ...(logMaxSize && { maxSize: logMaxSize }),
-    }),
-  ];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      filename: insertAt(logConfiguration.file!, '-%DATE%', logConfiguration.file!.indexOf('.log')),
+      ...(logMaxFiles != null && { maxFiles: logMaxFiles }),
+      ...(logMaxSize != null && { 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)()),
-  transports,
-});
+  silent: logConfiguration.enabled === false,
+  level: logConfiguration.level,
+  format: format.combine(
+    format.splat(),
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)()
+  ),
+  transports
+})
 
 //
 // If enabled, log to the `console` with the format:
 // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
 //
-if (Configuration.getLogConsole()) {
+if (logConfiguration.console === true) {
   logger.add(
     new TransportType.Console({
       format: format.combine(
         format.splat(),
-        (format[Configuration.getLogFormat()] as FormatWrap)()
-      ),
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)()
+      )
     })
-  );
+  )
 }