10000 fix(#614): bumped deps of debug, date-format, streamroller · wxqGitHub/log4js-node@8627f74 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8627f74

Browse files
author
Gareth Jones
committed
fix(log4js-node#614): bumped deps of debug, date-format, streamroller
1 parent b65871a commit 8627f74

12 files changed

+1790
-5948
lines changed

‎.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ lib-cov
1212
coverage.html
1313
Makefile
1414
coverage
15+
Gemfile
16+
Gemfile.lock

‎lib/configuration.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const debug = require('debug')('log4js:configuration');
88

99
let cluster;
1010
try {
11-
cluster = require('cluster'); // eslint-disable-line global-require
11+
cluster = require('cluster'); // eslint-disable-line global-require
1212
} catch (e) {
1313
debug('Clustering support disabled because require(cluster) threw an error: ', e);
1414
}
@@ -36,14 +36,11 @@ function anInteger(thing) {
3636
}
3737

3838
class Configuration {
39-
4039
throwExceptionIf(checks, message) {
4140
const tests = Array.isArray(checks) ? checks : [checks];
4241
tests.forEach((test) => {
4342
if (test) {
44-
throw new Error(
45-
`Problem with log4js configuration: (${util.inspect(this.candidate, { depth: 5 })}) - ${message}`
46-
);
43+
throw new Error(`Problem with log4js configuration: (${util.inspect(this.candidate, { depth: 5 })}) - ${message}`);
4744
}
4845
});
4946
}

‎lib/log4js.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const layouts = require('./layouts');
3131

3232
let cluster;
3333
try {
34-
cluster = require('cluster'); // eslint-disable-line global-require
34+
cluster = require('cluster'); // eslint-disable-line global-require
3535
} catch (e) {
3636
debug('Clustering support disabled because require(cluster) threw an error: ', e);
3737
}
@@ -78,9 +78,8 @@ function setLevelForCategory(category, level) {
7878
debug(`setLevelForCategory: found ${categoryConfig} for ${category}`);
7979
if (!categoryConfig) {
8080
const sourceCategoryConfig = configForCategory(category);
81-
debug(
82-
`setLevelForCategory: no config found for category, found ${sourceCategoryConfig} for parents of ${category}`
83-
);
81+
debug('setLevelForCategory: no config found for category, ' +
82+
`found ${sourceCategoryConfig} for parents of ${category}`);
8483
categoryConfig = { appenders: sourceCategoryConfig.appenders };
8584
}
8685
categoryConfig.level = level;
@@ -205,23 +204,22 @@ function configure(configurationFileOrObject) {
205204
LoggingEvent = loggerModule.LoggingEvent;
206205
module.exports.connectLogger = connectModule(config.levels).connectLogger;
207206

207+
// just in case configure is called after shutdown
208+
process.removeListener('message', receiver);
209+
cluster.removeListener('message', receiver);
208210
if (config.disableClustering) {
209211
debug('Not listening for cluster messages, because clustering disabled.');
210-
} else {
212+
} else if (isPM2Master()) {
211213
// PM2 cluster support
212214
// PM2 runs everything as workers - install pm2-intercom for this to work.
213215
// we only want one of the app instances to write logs
214-
if (isPM2Master()) {
215-
debug('listening for PM2 broadcast messages');
216-
process.removeListener('message', receiver);
217-
process.on('message', receiver);
218-
} else if (cluster.isMaster) {
219-
debug('listening for cluster messages');
220-
cluster.removeListener('message', receiver);
221-
cluster.on('message', receiver);
222-
} else {
223-
debug('not listening for messages, because we are not a master process');
224-
}
216+
debug('listening for PM2 broadcast messages');
217+
process.on('message', receiver);
218+
} else if (cluster.isMaster) {
219+
debug('listening for cluster messages');
220+
cluster.on('message', receiver);
221+
} else {
222+
debug('not listening for messages, because we are not a master process');
225223
}
226224

227225
enabled = true;

‎lib/logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const debug = require('debug')('log4js:logger');
66

77
let cluster;
88
try {
9-
cluster = require('cluster'); // eslint-disable-line global-require
9+
cluster = require('cluster'); // eslint-disable-line global-require
1010
} catch (e) {
1111
debug('Clustering support disabled because require(cluster) threw an error: ', e);
1212
}

0 commit comments

Comments
 (0)
0