diff --git a/package-lock.json b/package-lock.json index 20e0d83fcb..a4e493203f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13605,32 +13605,14 @@ } }, "winston-loggly-bulk": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/winston-loggly-bulk/-/winston-loggly-bulk-2.0.3.tgz", - "integrity": "sha512-OdpOo+nwVD6TAKv5z+FnvtG2mPhJAfLYgL2Vou+mAF5LaKRloo6I3plx4333pY9XHVI1RsSDYwbSabGcYiMIvQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/winston-loggly-bulk/-/winston-loggly-bulk-3.0.1.tgz", + "integrity": "sha512-C86aohUze/qCRYhOVyxgqTuz3HmDK4mLss3OsVHxb4hfD+gw8jAEl3LEMOsqWHEnoJp/MC0wE1N3PeUcisLi2g==", "requires": { + "clone": "^2.1.1", "node-loggly-bulk": "^2.0.1", - "winston": "^2.3.1" - }, - "dependencies": { - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" - }, - "winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - } - } + "winston": "^3.0", + "winston-transport": "^4.2.0" } }, "winston-transport": { diff --git a/package.json b/package.json index 4e5d18678d..c71a8ad898 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "validator": "^11.0.0", "vinyl-buffer": "^1.0.1", "winston": "^3.2.1", - "winston-loggly-bulk": "^2.0.2", + "winston-loggly-bulk": "^3.0.1", "xml2js": "^0.4.23" }, "private": true, diff --git a/website/server/libs/logger.js b/website/server/libs/logger.js index 52bc16bec1..2fe1331ff2 100644 --- a/website/server/libs/logger.js +++ b/website/server/libs/logger.js @@ -1,6 +1,6 @@ // Logger utility import winston from 'winston'; -import 'winston-loggly-bulk'; +import { Loggly } from 'winston-loggly-bulk'; import nconf from 'nconf'; import _ from 'lodash'; import { @@ -24,14 +24,13 @@ if (IS_PROD) { ), })); - /* logger.add(new winston.transports.Loggly(), { + logger.add(new Loggly({ inputToken: nconf.get('LOGGLY_TOKEN'), subdomain: nconf.get('LOGGLY_SUBDOMAIN'), tags: ['Winston-NodeJS'], - json: true, format.json() - }); */ + json: true, + })); } - // Do not log anything when testing unless specified } else if (!IS_TEST || (IS_TEST && ENABLE_LOGS_IN_TEST)) { logger