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

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index a558adad..b13ec047 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,44 +1,74 @@
-import { Console, File } from 'winston/lib/winston/transports';
-import { Logger, createLogger, format, transport } from 'winston';
+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 DailyRotateFile from 'winston-daily-rotate-file';
-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()) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
+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(), '-%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(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        logConfiguration.errorFile!,
+        '-%DATE%',
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        logConfiguration.errorFile!.indexOf('.log')
+      ),
+      level: 'error',
+      ...(logMaxFiles != null && { maxFiles: logMaxFiles }),
+      ...(logMaxSize != null && { maxSize: logMaxSize })
+    }),
+    new DailyRotateFile({
+      // 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 File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new File({ filename: Configuration.getLogFile() }),
-  ];
+    new TransportType.File({
+      filename: logConfiguration.errorFile,
+      level: 'error'
+    }),
+    new TransportType.File({
+      filename: logConfiguration.file
+    })
+  ]
 }
 
-let loggerInstance: Logger | null = null;
-const getLogger = () => {
-  if (!loggerInstance) {
-    loggerInstance = createLogger({
-      level: Configuration.getLogLevel(),
-      format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-      transports: transports,
-    });
-    return loggerInstance;
-  }
-};
+export const logger = createLogger({
+  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()) {
-  getLogger().add(new Console({
-    format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-  }));
+if (logConfiguration.console === true) {
+  logger.add(
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)()
+      )
+    })
+  )
 }
-
-export default getLogger;