X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=fde2f69d80c786d2a762fbde65e4cc702a17f9d9;hb=617cad0c86c3fea53b56a738bb0d6ddc3da05237;hp=a72bcbe6db3bfbbb8042afd93b64ba91a3546224;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index a72bcbe6..fde2f69d 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,43 +1,48 @@
-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 { type Logger, createLogger, format, type transport } from 'winston';
+import TransportType from 'winston/lib/winston/transports';
 import DailyRotateFile from 'winston-daily-rotate-file';
-import Utils from './Utils';
+
+// import { Configuration, Utils } from './internal';
+import { Configuration } from './Configuration';
+import { Utils } from './Utils';
 
 let transports: transport[];
-if (Configuration.getLogRotate()) {
+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')
+        Configuration.getLogErrorFile()?.indexOf('.log')
       ),
       level: 'error',
-      maxFiles: logMaxFiles,
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
     }),
     new DailyRotateFile({
       filename: Utils.insertAt(
         Configuration.getLogFile(),
         '-%DATE%',
-        Configuration.getLogFile().indexOf('.log')
+        Configuration.getLogFile()?.indexOf('.log')
       ),
-      maxFiles: logMaxFiles,
+      ...(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.getLogErrorFile(), level: 'error' }),
+    new TransportType.File({ filename: Configuration.getLogFile() }),
   ];
 }
 
 const logger: Logger = createLogger({
   level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-  transports: transports,
+  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as FormatWrap)()),
+  transports,
 });
 
 //
@@ -46,10 +51,13 @@ const logger: Logger = createLogger({
 //
 if (Configuration.getLogConsole()) {
   logger.add(
-    new Console({
-      format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        (format[Configuration.getLogFormat()] as FormatWrap)()
+      ),
     })
   );
 }
 
-export default logger;
+export { logger };