Upgrade Winston from 2.x to 3.x

lib/custom-api/session.js

@@ -12,7 +12,7 @@ const passwordHelper = require('./password-helper')
 
 const fs = require('fs')
 const jwt = require('jsonwebtoken')
-const logger = require('winston')
+const logger = require('../logger')
 
 function isSessionCreationEnabled () {
   return config.getConf('authentication:type') === 'jwt'

lib/custom-api/user.js

@@ -7,7 +7,7 @@
  */
 
 'use strict'
-const logger = require('winston')
+const logger = require('../logger')
 const passwordHelper = require('./password-helper')
 
 const FhirCommon = require('../fhir/common')

lib/fhir/core.js

@@ -7,7 +7,7 @@
  */
 'use strict'
 
-const logger = require('winston')
+const logger = require('../logger')
 
 const FhirCommon = require('./common')
 const Authorization = require('../security/authorization')

lib/fhir/module-loader.js

@@ -10,7 +10,7 @@
 
 const fs = require('fs')
 const path = require('path')
-const logger = require('winston')
+const logger = require('../logger')
 
 const fhirResources = {}
 

lib/fhir/resources/binary.js

@@ -9,7 +9,7 @@
 'use strict'
 
 const mongodb = require('mongodb')
-const logger = require('winston')
+const logger = require('../../logger')
 
 const FhirCommon = require('../common')
 const FhirRoot = require('../root')

lib/fhir/resources/patient.js

@@ -7,7 +7,7 @@
  */
 
 'use strict'
-const logger = require('winston')
+const logger = require('../../logger')
 
 const config = require('../../config')
 const FhirCommon = require('../common')

lib/fhir/resources/practitioner.js

@@ -8,7 +8,7 @@
 
 'use strict'
 
-const logger = require('winston')
+const logger = require('../../logger')
 
 const FhirCommon = require('../common')
 const QueryUtils = require('../query-utils')

lib/fhir/root.js

@@ -10,7 +10,7 @@
 
 const async = require('async')
 const url = require('url')
-const logger = require('winston')
+const logger = require('../logger')
 
 const FhirCommon = require('./common')
 const FhirCore = require('./core')

lib/fhir/services/matching-worker/matching-worker.js

@@ -8,7 +8,7 @@
 'use strict'
 
 const cp = require('child_process')
-const logger = require('winston')
+const logger = require('../../../logger')
 
 module.exports = (mongo) => {
   const startMatchingWorker = (context) => {

lib/fhir/services/terminology-service.js

@@ -7,7 +7,7 @@
  */
 
 'use strict'
-const logger = require('winston')
+const logger = require('../../logger')
 const FhirCommon = require('../common')
 
 module.exports = (mongo) => {

lib/init.js

@@ -10,14 +10,3 @@
 
 const path = require('path')
 global.appRoot = path.join(path.resolve(__dirname), '..')
-
-// Load configuration
-const config = require('./config')
-
-const logger = require('winston')
-logger.remove(logger.transports.Console)
-logger.add(logger.transports.Console, {
-  colorize: true,
-  timestamp: true,
-  level: config.getConf('logger:level')
-})

lib/logger.js

@@ -0,0 +1,21 @@
+const config = require('./config')
+const winston = require('winston')
+
+const logger = winston.createLogger({
+  level: config.getConf('logger:level'),
+  format:
+    // Maintain the format from Winston 2.x.
+    winston.format.combine(
+      winston.format.colorize(),
+      winston.format.errors({ stack: true }),
+      winston.format.timestamp(),
+      winston.format.printf((info) => {
+        return `${info.timestamp} - ${info.level}: ${
+          info.stack == null ? info.message : info.stack
+        }`
+      })
+    ),
+  transports: [new winston.transports.Console()]
+})
+
+module.exports = exports = logger

lib/matching-queue/matching-queue.js

@@ -9,7 +9,7 @@
 'use strict'
 
 const cp = require('child_process')
-const logger = require('winston')
+const logger = require('../logger')
 
 module.exports = (mongo) => {
   const startWorker = (workers, workerName) => {

lib/mongo.js

@@ -9,7 +9,7 @@
 'use strict'
 const MongoClient = require('mongodb').MongoClient
 const config = require('./config')
-const logger = require('winston')
+const logger = require('./logger')
 
 const collapseWhenSingleClause = (query) => {
   const collapseOperatorsList = ['$and', '$or']

lib/plugins/audit.js

@@ -8,7 +8,6 @@
 
 'use strict'
 
-const logger = require('winston')
 const moment = require('moment')
 
 const EVENT_OUTCOME = {
@@ -29,7 +28,7 @@ const excludedResourceTypeInteractions = [
   }
 ]
 
-module.exports = (mongo, fhirResources) => {
+module.exports = (mongo, fhirResources, logger) => {
   const fhirCore = require('../fhir/core.js')(mongo, fhirResources)
 
   const getSuccessOrFailed = (data) => {

lib/plugins/default.js

@@ -8,9 +8,7 @@
 
 'use strict'
 
-const logger = require('winston')
-
-module.exports = () => {
+module.exports = (_mongo, _fhirResources, logger) => {
   return {
     userTypeRestrictions: {
       'sysadmin': {

lib/plugins/matching-queue.js

@@ -9,12 +9,11 @@
 'use strict'
 
 const mongoDbQueue = require('mongodb-queue')
-const logger = require('winston')
 
 const matchingConfig = require('../../config/matching')
 const constants = require('../constants')
 
-module.exports = (mongo) => {
+module.exports = (mongo, _fhirResources, logger) => {
   return {
     hooks: {
       after: [

lib/resource-linking.js

@@ -7,7 +7,7 @@
  */
 'use strict'
 
-const logger = require('winston')
+const logger = require('./logger')
 
 const FhirCommon = require('./fhir/common')
 const constants = require('./constants')

lib/security/authorization.js

@@ -7,7 +7,7 @@
  */
 
 'use strict'
-const logger = require('winston')
+const logger = require('../logger')
 const FhirCommon = require('../fhir/common')
 
 const userTypeRestrictions = {}

lib/security/jwt-authentication/index.js

@@ -11,7 +11,7 @@ const config = require('../../config')
 
 const fs = require('fs')
 const jwt = require('jsonwebtoken')
-const logger = require('winston')
+const logger = require('../../logger')
 
 const TOKEN_PATTERN = /^ *(?:[Bb][Ee][Aa][Rr][Ee][Rr]) +([A-Za-z0-9\-._~+/]+=*) *$/
 

lib/security/openhim-style-authentication.js

@@ -7,7 +7,7 @@
  */
 
 'use strict'
-const logger = require('winston')
+const logger = require('../logger')
 const config = require('../config')
 const crypto = require('crypto')
 const FhirCommon = require('../fhir/common')

lib/server.js

@@ -9,7 +9,7 @@
 'use strict'
 require('./init')
 
-const logger = require('winston')
+const logger = require('./logger')
 const express = require('express')
 const bodyParser = require('body-parser')
 const xmlParser = require('express-xml-bodyparser')
@@ -73,7 +73,7 @@ if (validationConf.enabled) {
 
 // Load plugins
 fs.readdirSync(path.resolve(`${global.appRoot}/lib/plugins`)).forEach((file) => {
-  const plugin = require(`./plugins/${file}`)(mongo, fhirResources)
+  const plugin = require(`./plugins/${file}`)(mongo, fhirResources, logger)
   if (plugin.userTypeRestrictions) {
     authorization.addUserTypeRestrictions(plugin.userTypeRestrictions)
   }

package.json

@@ -39,7 +39,7 @@
     "talisman": "^0.21.0",
     "urijs": "^1.19.2",
     "uuid": "^3.3.3",
-    "winston": "^2.4.2"
+    "winston": "^3.3.3"
   },
   "devDependencies": {
     "chalk": "^2.4.1",