From 6d5cef3810098e4dfe1ceca0dc1dea433b6a2504 Mon Sep 17 00:00:00 2001 From: Tyler Breisacher Date: Wed, 12 Jan 2022 12:04:35 -0800 Subject: [PATCH 1/3] Upgrade Winston --- lib/forever.js | 51 +++++++++++++++++++++------------------------- lib/forever/cli.js | 12 +++++------ package.json | 2 +- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/forever.js b/lib/forever.js index 13375f62..d658276c 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,26 @@ 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)() + ], + 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 +330,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 +360,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/lib/forever/cli.js b/lib/forever/cli.js index d63163a4..e00f35a8 100644 --- a/lib/forever/cli.js +++ b/lib/forever/cli.js @@ -359,7 +359,7 @@ app.cmd('stopall', cli.stopall = function () { if (processes) { forever.log.info('Forever stopped processes:'); processes.split('\n').forEach(function (line) { - forever.log.data(line); + forever.log.warn(line); }); } else { @@ -382,7 +382,7 @@ app.cmd('restartall', cli.restartAll = function () { if (processes) { forever.log.info('Forever restarted processes:'); processes.split('\n').forEach(function (line) { - forever.log.data(line); + forever.log.warn(line); }); } else { @@ -406,7 +406,7 @@ app.cmd(/restart (.+)/, cli.restart = function (file) { if (processes) { forever.log.info('Forever restarted process(es):'); processes.split('\n').forEach(function (line) { - forever.log.data(line); + forever.log.warn(line); }); } else { @@ -430,7 +430,7 @@ app.cmd('list', cli.list = function () { if (processes) { forever.log.info('Forever processes running'); processes.split('\n').forEach(function (line) { - forever.log.data(line); + forever.log.warn(line); }); } else { @@ -458,7 +458,7 @@ app.cmd('config', cli.config = function () { } conf.split('\n').forEach(function (line) { - forever.log.data(line); + forever.log.warn(line); }); }); @@ -510,7 +510,7 @@ app.cmd('logs :index', cli.logs = function (index) { return forever.log.error(err.message); } - forever.log.data(log.file.magenta + ':' + log.pid + ' - ' + log.line); + forever.log.warn(log.file.magenta + ':' + log.pid + ' - ' + log.line); }); }); 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", From 36ee9838d9bc0daae2d88eacece284a294f9cf34 Mon Sep 17 00:00:00 2001 From: Tyler Breisacher Date: Wed, 12 Jan 2022 14:28:36 -0800 Subject: [PATCH 2/3] use CLI levels --- lib/forever.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/forever.js b/lib/forever.js index d658276c..50cd81d2 100755 --- a/lib/forever.js +++ b/lib/forever.js @@ -66,6 +66,7 @@ forever.log = winston.createLogger({ transports: [ new (winston.transports.Console)() ], + levels: winston.config.cli.levels, format: winston.format.cli(), }); From 677c5365927f55f578cbb772efaf29ee6b24efc1 Mon Sep 17 00:00:00 2001 From: Tyler Breisacher Date: Wed, 12 Jan 2022 14:29:13 -0800 Subject: [PATCH 3/3] warn -> data --- lib/forever/cli.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/forever/cli.js b/lib/forever/cli.js index e00f35a8..d63163a4 100644 --- a/lib/forever/cli.js +++ b/lib/forever/cli.js @@ -359,7 +359,7 @@ app.cmd('stopall', cli.stopall = function () { if (processes) { forever.log.info('Forever stopped processes:'); processes.split('\n').forEach(function (line) { - forever.log.warn(line); + forever.log.data(line); }); } else { @@ -382,7 +382,7 @@ app.cmd('restartall', cli.restartAll = function () { if (processes) { forever.log.info('Forever restarted processes:'); processes.split('\n').forEach(function (line) { - forever.log.warn(line); + forever.log.data(line); }); } else { @@ -406,7 +406,7 @@ app.cmd(/restart (.+)/, cli.restart = function (file) { if (processes) { forever.log.info('Forever restarted process(es):'); processes.split('\n').forEach(function (line) { - forever.log.warn(line); + forever.log.data(line); }); } else { @@ -430,7 +430,7 @@ app.cmd('list', cli.list = function () { if (processes) { forever.log.info('Forever processes running'); processes.split('\n').forEach(function (line) { - forever.log.warn(line); + forever.log.data(line); }); } else { @@ -458,7 +458,7 @@ app.cmd('config', cli.config = function () { } conf.split('\n').forEach(function (line) { - forever.log.warn(line); + forever.log.data(line); }); }); @@ -510,7 +510,7 @@ app.cmd('logs :index', cli.logs = function (index) { return forever.log.error(err.message); } - forever.log.warn(log.file.magenta + ':' + log.pid + ' - ' + log.line); + forever.log.data(log.file.magenta + ':' + log.pid + ' - ' + log.line); }); });