Broadcast Channel: optimize requests handling implementation

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

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 61a3ec0d3b9a9c141526cd3f293e6050da871bbc..1baea780f3625896b95b43ca62986756bfd847c0 100644 (file)
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,44 +1,59 @@
-import { Console, File } from 'winston/lib/winston/transports';
+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 DailyRotateFile from 'winston-daily-rotate-file';
 import Utils from './Utils';
 
 let transports: transport[];
 if (Configuration.getLogRotate()) {
   const logMaxFiles = Configuration.getLogMaxFiles();
   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: 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 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() }),
   ];
 }
 
-let loggerInstance: Logger | null = null;
-const getLogger = (): Logger => {
-  if (!loggerInstance) {
-    loggerInstance = createLogger({
-      level: Configuration.getLogLevel(),
-      format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
-      transports: transports,
-    });
-    return loggerInstance;
-  }
-};
+const logger: Logger = createLogger({
+  level: Configuration.getLogLevel(),
+  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()),
+  transports: 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()]()),
-  }));
+  logger.add(
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        (format[Configuration.getLogFormat()] as () => Format)()
+      ),
+    })
+  );
 }
 
-export default getLogger;
+export default logger;