Merge pull request ExpressGateway#764 from ExpressGateway/feat/deps-update

Update all dependencies

Author: XVincentX

lib/logger.js

@@ -1,74 +1,26 @@
-const winston = require('winston');
+const { createLogger, format, transports } = require('winston');
+const { combine, colorize, label, printf, splat } = format;
 // TODO: rm LOG_LEVEL and LOG_LEVEL_xxx env vars and configure it system config;
 // system config will provide env vars support
 
-const colorize = process.env.LOG_COLORIZE !== 'false';
-const timestamp = process.env.LOG_TIMESTAMP === 'true';
+const logFormat = (loggerLabel) => combine(
+  splat(),
+  colorize(),
+  label({ label: loggerLabel }),
+  printf(info => `${info.label} ${info.level}: ${info.message}`)
+);
 
-winston.loggers.add('EG:gateway', {
-  console: {
-    level: process.env.LOG_LEVEL_GATEWAY || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:gateway'
-  }
-});
-winston.loggers.add('EG:policy', {
-  console: {
-    level: process.env.LOG_LEVEL_POLICY || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:policy'
-  }
-});
-winston.loggers.add('EG:admin', {
-  console: {
-    level: process.env.LOG_LEVEL_ADMIN || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:admin'
-  }
-});
-winston.loggers.add('EG:test', {
-  console: {
-    level: process.env.LOG_LEVEL_TEST || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:test'
-  }
-});
-winston.loggers.add('EG:config', {
-  console: {
-    level: process.env.LOG_LEVEL_CONFIG || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:config'
-  }
-});
-winston.loggers.add('EG:db', {
-  console: {
-    level: process.env.LOG_LEVEL_DB || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:db'
-  }
-});
-winston.loggers.add('EG:plugins', {
-  console: {
-    level: process.env.LOG_LEVEL_PLUGINS || process.env.LOG_LEVEL || 'warn',
-    colorize,
-    timestamp,
-    label: 'EG:plugins'
-  }
+const createLoggerWithLabel = (label) => createLogger({
+  level: process.env.LOG_LEVEL_GATEWAY || process.env.LOG_LEVEL || 'warn',
+  transports: [new transports.Console({})],
+  format: logFormat(label)
 });
 
-winston.level = process.env.LOG_LEVEL || 'warn';
 module.exports = {
-  gateway: winston.loggers.get('EG:gateway'),
-  policy: winston.loggers.get('EG:policy'),
-  test: winston.loggers.get('EG:test'),
-  config: winston.loggers.get('EG:config'),
-  db: winston.loggers.get('EG:db'),
-  admin: winston.loggers.get('EG:admin'),
-  plugins: winston.loggers.get('EG:plugins')
+  gateway: createLoggerWithLabel('[EG:gateway]'),
+  policy: createLoggerWithLabel('[EG:policy]'),
+  config: createLoggerWithLabel('[EG:config]'),
+  db: createLoggerWithLabel('[EG:db]'),
+  admin: createLoggerWithLabel('[EG:admin]'),
+  plugins: createLoggerWithLabel('[EG:plugins]')
 };