X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=1e22e4050293eeb6c43d295d6d79933723feeef3;hb=c1c97db8708f26af10385f6e86af7cd933891bb8;hp=ccbc63cade75a2753793c4669b4fbcfb49dafafc;hpb=8387cd3144acc55a2eaa20d8cf26745a4456f9d8;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index ccbc63ca..1e22e405 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,38 +1,93 @@
-import { Console, File } from 'winston/lib/winston/transports';
-import { Logger, createLogger, format, transport } from 'winston';
-
-import Configuration from './Configuration';
+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 Utils from './Utils';
+
+import { Configuration } from './Configuration';
+import { insertAt } from './Utils';
+import { ConfigurationSection, type LogConfiguration } from '../types';
 
 let transports: transport[];
-if (Configuration.getLogRotate()) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
+if (
+  Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).rotate === true
+) {
+  const logMaxFiles = Configuration.getConfigurationSection<LogConfiguration>(
+    ConfigurationSection.log,
+  ).maxFiles;
+  const logMaxSize = Configuration.getConfigurationSection<LogConfiguration>(
+    ConfigurationSection.log,
+  ).maxSize;
   transports = [
-    new DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogErrorFile(), '-%DATE%', Configuration.getLogErrorFile().indexOf('.log')), level: 'error', maxFiles: logMaxFiles }),
-    new DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogFile(), '-%DATE%', Configuration.getLogFile().indexOf('.log')), maxFiles: logMaxFiles }),
+    new DailyRotateFile({
+      filename: insertAt(
+        Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+          .errorFile!,
+        '-%DATE%',
+        Configuration.getConfigurationSection<LogConfiguration>(
+          ConfigurationSection.log,
+        ).errorFile!.indexOf('.log'),
+      ),
+      level: 'error',
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
+    new DailyRotateFile({
+      filename: insertAt(
+        Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).file!,
+        '-%DATE%',
+        Configuration.getConfigurationSection<LogConfiguration>(
+          ConfigurationSection.log,
+        ).file!.indexOf('.log'),
+      ),
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
   ];
 } else {
   transports = [
-    new File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new File({ filename: Configuration.getLogFile() }),
+    new TransportType.File({
+      filename: Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+        .errorFile,
+      level: 'error',
+    }),
+    new TransportType.File({
+      filename: Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+        .file,
+    }),
   ];
 }
 
-const logger: Logger = createLogger({
-  level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-  transports: transports,
+export const logger = createLogger({
+  silent: !Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+    .enabled,
+  level: Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).level,
+  format: format.combine(
+    format.splat(),
+    (
+      format[
+        Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).format!
+      ] as FormatWrap
+    )(),
+  ),
+  transports,
 });
 
 //
 // If enabled, log to the `console` with the format:
 // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
 //
-if (Configuration.getLogConsole()) {
-  logger.add(new Console({
-    format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-  }));
+if (Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log).console) {
+  logger.add(
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        (
+          format[
+            Configuration.getConfigurationSection<LogConfiguration>(ConfigurationSection.log)
+              .format!
+          ] as FormatWrap
+        )(),
+      ),
+    }),
+  );
 }
-
-export default logger;