X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FLogger.ts;h=5a98ed990dad3117e9c0257013fb2e43c80d0b98;hb=1e080116b0b62d897258a28efa129a9a65bf7d4e;hp=2f67f15d750a78ab1bbcb644eca973abf699044f;hpb=f6aa64122833d24ed52a882bf7376788f3917748;p=e-mobility-charging-stations-simulator.git diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts index 2f67f15d..5a98ed99 100644 --- a/src/utils/Logger.ts +++ b/src/utils/Logger.ts @@ -3,14 +3,30 @@ import { Logger, createLogger, format, transport } from 'winston'; import Configuration from './Configuration'; import DailyRotateFile from 'winston-daily-rotate-file'; +import { Format } from 'logform'; 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 = [ @@ -20,8 +36,8 @@ if (Configuration.getLogRotate()) { } const logger: Logger = createLogger({ - level: Configuration.getLogLevel().toLowerCase(), - format: format.combine(format.splat(), format[Configuration.getLogFormat()]()), + level: Configuration.getLogLevel(), + format: format.combine(format.splat(), (format[Configuration.getLogFormat()] as () => Format)()), transports: transports, }); @@ -30,9 +46,14 @@ const logger: Logger = createLogger({ // `${info.level}: ${info.message} JSON.stringify({ ...rest }) ` // if (Configuration.getLogConsole()) { - logger.add(new Console({ - format: format.combine(format.splat(), format[Configuration.getLogFormat()]()), - })); + logger.add( + new Console({ + format: format.combine( + format.splat(), + (format[Configuration.getLogFormat()] as () => Format)() + ), + }) + ); } export default logger;