diff --git a/lib/forever.js b/lib/forever.js index 13375f62..50cd81d2 100755 --- a/lib/forever.js +++ b/lib/forever.js @@ -41,26 +41,6 @@ function newEmitter() { return new events2.EventEmitter2() } -// -// Setup `forever.log` to be a custom `winston` logger. -// -forever.log = new (winston.Logger)({ - transports: [ - new (winston.transports.Console)() - ] -}); - -forever.log.cli(); - -// -// Setup `forever out` for logEvents with `winston` custom logger. -// -forever.out = new (winston.Logger)({ - transports: [ - new (winston.transports.Console)() - ] -}); - // // ### Export Components / Settings // Export `version` and important Prototypes from `lib/forever/*` @@ -79,6 +59,27 @@ forever.cli = require('./forever/cli'); // exports.version = require('../package').version; +// +// Setup `forever.log` to be a custom `winston` logger. +// +forever.log = winston.createLogger({ + transports: [ + new (winston.transports.Console)() + ], + levels: winston.config.cli.levels, + format: winston.format.cli(), +}); + +// +// Setup `forever out` for logEvents with `winston` custom logger. +// +forever.out = winston.createLogger({ + format: (forever.config.get('timestamp') === 'true') ? winston.format.timestamp(): undefined, + transports: [ + new winston.transports.Console(), + ], +}); + // // ### function getSockets (sockPath, callback) // #### @sockPath {string} Path in which to look for UNIX domain sockets @@ -330,11 +331,6 @@ forever.load = function (options) { forever.config.set('logstream', options.logstream); forever.config.set('columns', options.columns); - // - // Setup timestamp to event logger - // - forever.out.transports.console.timestamp = forever.config.get('timestamp') === 'true'; - // // Attempt to see if `forever` has been configured to // run in debug mode. @@ -365,10 +361,10 @@ forever._debug = function () { if (!debug) { forever.config.set('debug', true); - forever.log.add(winston.transports.File, { + forever.log.add(new winston.transports.File({ level: 'silly', - filename: path.join(forever.config.get('root'), 'forever.debug.log') - }); + filename: path.join(forever.config.get('root'), 'forever.debug.log'), + })); } }; diff --git a/package.json b/package.json index e8885d24..89823857 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "object-assign": "^4.1.1", "prettyjson": "^1.2.2", "shush": "^1.0.0", - "winston": "~0.8.1" + "winston": "^3.4.0" }, "devDependencies": { "chai": "^4.2.0",