X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=d48659f4bbaea774db5c32b2f44ff784eeaa8245;hb=039211f91daa930e261a976c0c5ffbf729fbe922;hp=61e4b0bc24dd1e4887b7fc6c91a69c87d010a7e1;hpb=9988696df26aba9c34733f9093ebf3d957ba9d02;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 61e4b0bc..d48659f4 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,13 +1,14 @@
-import type { Format } from 'logform';
-import { Logger, createLogger, format, transport } from 'winston';
-import DailyRotateFile from 'winston-daily-rotate-file';
+import type { FormatWrap } from 'logform';
+import { type Logger, createLogger, format, type transport } from 'winston';
 import TransportType from 'winston/lib/winston/transports/index.js';
+import DailyRotateFile from 'winston-daily-rotate-file';
 
-import Configuration from './Configuration';
-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 = [
@@ -15,7 +16,7 @@ if (Configuration.getLogRotate()) {
       filename: Utils.insertAt(
         Configuration.getLogErrorFile(),
         '-%DATE%',
-        Configuration.getLogErrorFile().indexOf('.log')
+        Configuration.getLogErrorFile()?.indexOf('.log')
       ),
       level: 'error',
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
@@ -25,7 +26,7 @@ if (Configuration.getLogRotate()) {
       filename: Utils.insertAt(
         Configuration.getLogFile(),
         '-%DATE%',
-        Configuration.getLogFile().indexOf('.log')
+        Configuration.getLogFile()?.indexOf('.log')
       ),
       ...(logMaxFiles && { maxFiles: logMaxFiles }),
       ...(logMaxSize && { maxSize: logMaxSize }),
@@ -40,7 +41,7 @@ if (Configuration.getLogRotate()) {
 
 const logger: Logger = createLogger({
   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,10 @@ if (Configuration.getLogConsole()) {
     new TransportType.Console({
       format: format.combine(
         format.splat(),
-        (format[Configuration.getLogFormat()] as () => Format)()
+        (format[Configuration.getLogFormat()] as FormatWrap)()
       ),
     })
   );
 }
 
-export default logger;
+export { logger };