X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils%2FLogger.ts;h=c4db93c0c363ce065502c73cd32e89ea2d41f3e5;hb=5edd8ba0f8978cfb3ca9d80f299d9748c6c5970e;hp=61e4b0bc24dd1e4887b7fc6c91a69c87d010a7e1;hpb=9988696df26aba9c34733f9093ebf3d957ba9d02;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 61e4b0bc..c4db93c0 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,31 +1,31 @@
-import type { Format } from 'logform';
-import { Logger, createLogger, format, transport } from 'winston';
-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 { Configuration } from './Configuration';
+import { insertAt } from './Utils';
 
 let transports: transport[];
-if (Configuration.getLogRotate()) {
-  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(),
+      filename: insertAt(
+        Configuration.getLog().errorFile,
         '-%DATE%',
-        Configuration.getLogErrorFile().indexOf('.log')
+        Configuration.getLog().errorFile?.indexOf('.log'),
       ),
       level: 'error',
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
     }),
     new DailyRotateFile({
-      filename: Utils.insertAt(
-        Configuration.getLogFile(),
+      filename: insertAt(
+        Configuration.getLog().file,
         '-%DATE%',
-        Configuration.getLogFile().indexOf('.log')
+        Configuration.getLog().file?.indexOf('.log'),
       ),
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
@@ -33,14 +33,15 @@ if (Configuration.getLogRotate()) {
   ];
 } 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 }),
   ];
 }
 
-const logger: Logger = createLogger({
-  level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()),
+export const logger = createLogger({
+  silent: !Configuration.getLog().enabled,
+  level: Configuration.getLog().level,
+  format: format.combine(format.splat(), (format[Configuration.getLog().format] as FormatWrap)()),
   transports,
 });
 
@@ -48,15 +49,13 @@ const logger: 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 () => Format)()
+        (format[Configuration.getLog().format] as FormatWrap)(),
       ),
-    })
+    }),
   );
 }
-
-export default logger;