Add unit tests for more Utils. helpers

[e-mobility-charging-stations-simulator.git] / src / utils / Logger.ts

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index dfd04e90a89ede63f3b8ac9ef1c91b150b37af93..95d5347da47f12f708f003e5a43df5d36a16ec19 100644 (file)
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,6 +1,7 @@
-import 'winston-daily-rotate-file';
-
-import winston, { transport } from 'winston';
+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';
@@ -9,20 +10,35 @@ let transports: transport[];
 if (Configuration.getLogRotate()) {
   const logMaxFiles = Configuration.getLogMaxFiles();
   transports = [
-    new winston.transports.DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogErrorFile(), '-%DATE%', Configuration.getLogErrorFile().indexOf('.log')), level: 'error', maxFiles: logMaxFiles }),
-    new winston.transports.DailyRotateFile({ filename: Utils.insertAt(Configuration.getLogFile(), '-%DATE%', Configuration.getLogFile().indexOf('.log')), maxFiles: logMaxFiles }),
+    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,
+    }),
   ];
 } else {
   transports = [
-    new winston.transports.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new winston.transports.File({ filename: Configuration.getLogFile() }),
+    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: transports,
+  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()),
+  transports,
 });
 
 //
@@ -30,9 +46,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;