Merge pull request #836 from SAP/dependabot/npm_and_yarn/tsx-4.0.0

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

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index dfd04e90a89ede63f3b8ac9ef1c91b150b37af93..239ec9186310c2de9d2a6f94d78f8d75d99597f3 100644 (file)
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,38 +1,69 @@
-import 'winston-daily-rotate-file';
+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 winston, { transport } from 'winston';
-
-import Configuration from './Configuration';
-import Utils from './Utils';
+import { Configuration } from './Configuration';
+import { insertAt } from './Utils';
+import { ConfigurationSection, type LogConfiguration } from '../types';
 
+const logConfiguration = Configuration.getConfigurationSection<LogConfiguration>(
+  ConfigurationSection.log,
+);
 let transports: transport[];
-if (Configuration.getLogRotate()) {
-  const logMaxFiles = Configuration.getLogMaxFiles();
+if (logConfiguration.rotate === true) {
+  const logMaxFiles = logConfiguration.maxFiles;
+  const logMaxSize = logConfiguration.maxSize;
   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: insertAt(
+        logConfiguration.errorFile!,
+        '-%DATE%',
+        logConfiguration.errorFile!.indexOf('.log'),
+      ),
+      level: 'error',
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
+    new DailyRotateFile({
+      filename: insertAt(logConfiguration.file!, '-%DATE%', logConfiguration.file!.indexOf('.log')),
+      ...(logMaxFiles && { maxFiles: logMaxFiles }),
+      ...(logMaxSize && { maxSize: logMaxSize }),
+    }),
   ];
 } else {
   transports = [
-    new winston.transports.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new winston.transports.File({ filename: Configuration.getLogFile() }),
+    new TransportType.File({
+      filename: logConfiguration.errorFile,
+      level: 'error',
+    }),
+    new TransportType.File({
+      filename: logConfiguration.file,
+    }),
   ];
 }
 
-const logger = winston.createLogger({
-  level: Configuration.getLogLevel(),
-  format: winston.format.combine(winston.format.splat(), winston.format[Configuration.getLogFormat()]()),
-  transports: transports,
+export const logger = createLogger({
+  silent: !logConfiguration.enabled,
+  level: logConfiguration.level,
+  format: format.combine(
+    format.splat(),
+    (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)(),
+  ),
+  transports,
 });
 
 //
 // If enabled, log to the `console` with the format:
 // `${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()]()),
-  }));
+if (logConfiguration.console) {
+  logger.add(
+    new TransportType.Console({
+      format: format.combine(
+        format.splat(),
+        (format[logConfiguration.format! as keyof FormatWrap] as FormatWrap)(),
+      ),
+    }),
+  );
 }
-
-export default logger;