Merge branch 'master' of github.com:LucasBrazi06/ev-simulator into rollup

diff --git a/Gruntfile.js b/Gruntfile.js
index eeaeb558884a885df61876c18864d9e0371759f0..c42c9a5643332cae9f72027a0742c6f5f1c2e27e 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,7 @@ module.exports = function(grunt) {
       buildWatch: {
         watch: './src',
       },
-      prod: {}
+      build: {}
     },
     mkdir: {
       assets: {
@@ -33,5 +33,5 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-mkdir');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-ts');
-  grunt.registerTask('default', ['clean:build', 'ts:prod', 'mkdir:assets', 'copy:assets']);
+  grunt.registerTask('default', ['clean:build', 'ts:build', 'mkdir:assets', 'copy:assets']);
 };

diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index dfd04e90a89ede63f3b8ac9ef1c91b150b37af93..ccbc63cade75a2753793c4669b4fbcfb49dafafc 100644 (file)
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -1,27 +1,27 @@
-import 'winston-daily-rotate-file';
-
-import winston, { transport } from 'winston';
+import { Console, File } from 'winston/lib/winston/transports';
+import { Logger, createLogger, format, transport } from 'winston';
 
 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 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: 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 winston.transports.File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
-    new winston.transports.File({ filename: Configuration.getLogFile() }),
+    new File({ filename: Configuration.getLogErrorFile(), level: 'error' }),
+    new File({ filename: Configuration.getLogFile() }),
   ];
 }
 
-const logger = winston.createLogger({
+const logger: Logger = createLogger({
   level: Configuration.getLogLevel(),
-  format: winston.format.combine(winston.format.splat(), winston.format[Configuration.getLogFormat()]()),
+  format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
   transports: transports,
 });
 
@@ -30,8 +30,8 @@ const logger = winston.createLogger({
 // `${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()]()),
+  logger.add(new Console({
+    format: format.combine(format.splat(), format[Configuration.getLogFormat()]()),
   }));
 }