@autofleet/node-common 1.1.1 → 1.1.2

package/logger/example.js

@@ -1,4 +1,6 @@
 const logger = require('./index')('debug')
+
 logger.info('it is working')
 logger.error('errors displayed in logs/error.log')
-logger.debug('debug with object', {a: 5})
+logger.debug('debug with object', { a: 5 })
+logger.debug('debug with 2 objects', { 1: { a: 5 }, 2: { b: 2 } })

package/logger/index.js

@@ -1,4 +1,7 @@
-const winston = require('winston')
+const { createLogger, transports, format } = require('winston')
+
+const { combine, timestamp, printf } = format
+
 require('dotenv').config()
 
 const { env } = process
@@ -12,20 +15,39 @@ const getLevel = (logLevel) => {
 }
 
 const getTransporters = () => {
-  let transporters = [new winston.transports.Console()]
+  const consoleTrasporter = new transports.Console()
+  let transporters = [consoleTrasporter]
   if (env.USE_LOG_FILES === 'true') {
     transporters = transporters.concat([
-      new winston.transports.File({ filename: 'logs/error.log', level: 'error' }),
-      new winston.transports.File({ filename: 'logs/all.log' }),
+      new transports.File({ filename: 'logs/error.log', level: 'error' }),
+      new transports.File({ filename: 'logs/all.log' }),
     ])
   }
   return transporters
 }
 
-const createLogger = (level, transporters) => {
-  const logger = winston.createLogger({
+const newLogger = (level, transporters) => {
+  const customFormat = printf((info) => {
+    const level = info.level
+    const message = info.message
+    const timestamp = info.timestamp
+    delete info.level
+    delete info.message
+    delete info.timestamp
+    const params = JSON.stringify(info, null, 2)
+    return `${level}: ${message} ${timestamp} \n ${params} \n *****************`
+  })
+
+  const logger = createLogger({
+    format: combine(
+      format.colorize(),
+      // format.json(),
+      format.simple(),
+      // prettyPrint(),
+      timestamp(),
+      customFormat,
+    ),
     level,
-    format: winston.format.json(),
     transports: transporters,
   })
 
@@ -35,7 +57,8 @@ const createLogger = (level, transporters) => {
 const getLogger = (logLevel) => {
   const level = getLevel(logLevel)
   const transporters = getTransporters()
-  return createLogger(level, transporters)
+  return newLogger(level, transporters)
 }
 
 module.exports = getLogger
+

package/logger/index.test.js

@@ -14,52 +14,50 @@ const deleteLogFile = (filePath) => {
   }
 }
 
-const waitForFileToHaveContent = ((filePath) => {
-  return wait.limit(30).until(() => {
-    if (fs.existsSync(filePath)) {
-      const content = fs.readFileSync(filePath, 'utf8')
-      return content !== ''
-    }
-    return false
-  })
-})
+const waitForFileToHaveContent = (filePath => wait.limit(30).until(() => {
+  if (fs.existsSync(filePath)) {
+    const content = fs.readFileSync(filePath, 'utf8')
+    return content !== ''
+  }
+  return false
+}))
 
 describe('Logger', () => {
   it('it`s default level is info', () => {
-    env.NODE_ENV=''
+    env.NODE_ENV = ''
     const logger = Logger()
     expect(logger).toBeDefined()
     expect(logger.level).toBe('info')
   })
 
   it('its default develpment level is debug', () => {
-    env.NODE_ENV='development'
+    env.NODE_ENV = 'development'
     const logger = Logger()
     expect(logger.level).toBe('debug')
   })
 
   it('its default test level is info', () => {
-    env.NODE_ENV='test'
+    env.NODE_ENV = 'test'
     const logger = Logger()
     expect(logger.level).toBe('info')
   })
 
   it('its default production level is info', () => {
-    env.NODE_ENV='production'
+    env.NODE_ENV = 'production'
     const logger = Logger()
     expect(logger.level).toBe('info')
   })
 
   it('its level can be override by LOG_LEVEL env variable', () => {
-    env.NODE_ENV='development'
-    env.LOG_LEVEL='warn'
+    env.NODE_ENV = 'development'
+    env.LOG_LEVEL = 'warn'
     const logger = Logger()
     expect(logger.level).toBe('warn')
   })
 
   it('its level can be override by function variable', () => {
-    env.NODE_ENV='production'
-    env.LOG_LEVEL='warn'
+    env.NODE_ENV = 'production'
+    env.LOG_LEVEL = 'warn'
     const logger = Logger('silly')
     expect(logger.level).toBe('silly')
   })
@@ -75,31 +73,31 @@ describe('Logger', () => {
   })
 
   it('it can have general file transporters', async () => {
-    env.USE_LOG_FILES='true'
+    env.USE_LOG_FILES = 'true'
     const allPath = 'logs/all.log'
     deleteLogFile(allPath)
 
     const logger = Logger()
-    const errorText = "this is error"
+    const errorText = 'this is error'
     logger.error(errorText)
 
     await waitForFileToHaveContent(allPath)
 
     expect(fs.existsSync(allPath)).toBe(true)
-  
+
     const contents = fs.readFileSync(allPath, 'utf8')
     expect(contents).toBe(`error: ${errorText}\n`)
   })
 
   it('it can have general file transporters', async () => {
-    env.USE_LOG_FILES='true'
+    env.USE_LOG_FILES = 'true'
     const errorPath = 'logs/error.log'
     deleteLogFile(errorPath)
 
     expect(fs.existsSync(errorPath)).toBe(false)
 
     const logger = Logger()
-    const errorText = "this is error"
+    const errorText = 'this is error'
     logger.error(errorText)
 
     await waitForFileToHaveContent(errorPath)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",