X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=c3ea5c5c95defc83622e5571186193c025e02b15;hb=b03df580733c540eafc26269ee267b675e6b4ae8;hp=e45550c98a536d0c63a1d99d4e256526b736b89e;hpb=7ec46a9aab2376a8a5201ce57aba95116a00d291;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index e45550c9..c3ea5c5c 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,22 +1,47 @@
-import 'winston-daily-rotate-file';
+import type { Format } from 'logform';
+import { Logger, createLogger, format, transport } from 'winston';
+import DailyRotateFile from 'winston-daily-rotate-file';
+import TransportType from 'winston/lib/winston/transports/index.js';
 
 import Configuration from './Configuration';
 import Utils from './Utils';
-import winston from 'winston';
 
-const maxLogFiles = 7;
+let transports: transport[];
+if (Configuration.getLogRotate() === true) {
+  const logMaxFiles = Configuration.getLogMaxFiles();
+  const logMaxSize = Configuration.getLogMaxSize();
+  transports = [
+    new DailyRotateFile({
+      filename: Utils.insertAt(
+        Configuration.getLogErrorFile(),
+        '-%DATE%',
+        Configuration.getLogErrorFile().indexOf('.log')
+      ),
+      level: 'error',
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
+    new DailyRotateFile({
+      filename: Utils.insertAt(
+        Configuration.getLogFile(),
+        '-%DATE%',
+        Configuration.getLogFile().indexOf('.log')
+      ),
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
+  ];
+} else {
+  transports = [
+    new TransportType.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
+    new TransportType.File({ filename: Configuration.getLogFile() }),
+  ];
+}
 
-const logger = winston.createLogger({
+const logger: Logger = createLogger({
   level: Configuration.getLogLevel(),
-  format: winston.format.combine(winston.format.splat(), winston.format[Configuration.getLogFormat()]()),
-  transports: [
-    //
-    // - Write to all logs with level `info` and below to `combined.log`
-    // - Write all logs error (and below) to `error.log`.
-    //
-    new winston.transports.DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogErrorFile(), '-%DATE%', Configuration.getLogErrorFile().indexOf('.log')), level: 'error', maxFiles: maxLogFiles }),
-    new winston.transports.DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogFile(), '-%DATE%', Configuration.getLogFile().indexOf('.log')), maxFiles: maxLogFiles }),
-  ],
+  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()),
+  transports,
 });
 
 //
@@ -24,9 +49,14 @@ const logger = winston.createLogger({
 // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
 //
 if (Configuration.getLogConsole()) {
-  logger.add(new winston.transports.Console({
-    format: winston.format.combine(winston.format.splat(), winston.format[Configuration.getLogFormat()]()),
-  }));
+  logger.add(
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        (format[Configuration.getLogFormat()] as () => Format)()
+      ),
+    })
+  );
 }
 
 export default logger;