X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=637beb5bd533bffe6f0fb91cc8124bef730ce381;hb=d7dd51247ad8860ab4b4eb7b730b7eee4bbb0fca;hp=7528d202a8e15b2dddaab52c86af46e5e05b8887;hpb=65b0c151a66f8b6d99a30a2565cd9bb00576baeb;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 7528d202..637beb5b 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,10 +1,10 @@
-import type { Format } from 'logform';
-import { Logger, createLogger, format, transport } from 'winston';
+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 TransportType from 'winston/lib/winston/transports';
 
-import Configuration from './Configuration';
-import Utils from './Utils';
+import { Configuration } from './Configuration';
+import { Utils } from './Utils';
 
 let transports: transport[];
 if (Configuration.getLogRotate() === true) {
@@ -15,7 +15,7 @@ if (Configuration.getLogRotate() === true) {
       filename: Utils.insertAt(
         Configuration.getLogErrorFile(),
         '-%DATE%',
-        Configuration.getLogErrorFile().indexOf('.log')
+        Configuration.getLogErrorFile()?.indexOf('.log')
       ),
       level: 'error',
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
@@ -25,7 +25,7 @@ if (Configuration.getLogRotate() === true) {
       filename: Utils.insertAt(
         Configuration.getLogFile(),
         '-%DATE%',
-        Configuration.getLogFile().indexOf('.log')
+        Configuration.getLogFile()?.indexOf('.log')
       ),
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
@@ -38,9 +38,10 @@ if (Configuration.getLogRotate() === true) {
   ];
 }
 
-const logger: Logger = createLogger({
+export const logger = createLogger({
+  silent: !Configuration.getLogEnabled(),
   level: Configuration.getLogLevel(),
-  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()),
+  format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as FormatWrap)()),
   transports,
 });
 
@@ -53,10 +54,8 @@ if (Configuration.getLogConsole()) {
     new TransportType.Console({
       format: format.combine(
         format.splat(),
-        (format[Configuration.getLogFormat()] as () => Format)()
+        (format[Configuration.getLogFormat()] as FormatWrap)()
       ),
     })
   );
 }
-
-export default logger;