Skip to content

Commit

Permalink
Upgrade Winston (#1128)
Browse files Browse the repository at this point in the history
  • Loading branch information
MatrixFrog authored Jan 14, 2022
1 parent 980ea04 commit a0fb120
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 29 deletions.
52 changes: 24 additions & 28 deletions lib/forever.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/*`
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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'),
}));
}
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit a0fb120

Please sign in to comment.