Merge pull request #1206 from log4js-node/update-eslint

chore(lint): improve eslint rules
This commit is contained in:
Lam Wei Li 2022-03-12 16:03:40 +08:00 committed by GitHub
commit 2426fbc62b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 21 additions and 20 deletions

View File

@ -11,8 +11,10 @@
"indent": 2,
"func-names": 0,
"max-len": [1, 120, 2],
"no-cond-assign": ["error", "except-parens"],
"no-use-before-define": ["warn"],
"no-param-reassign": 0,
"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
"strict": 1,
"import/no-extraneous-dependencies": 1
}

View File

@ -10,7 +10,8 @@ function openTheStream(filename, pattern, options) {
options
);
stream.on('error', (err) => {
console.error('log4js.dateFileAppender - Writing to file %s, error happened ', filename, err); // eslint-disable-line
// eslint-disable-next-line no-console
console.error('log4js.dateFileAppender - Writing to file %s, error happened ', filename, err);
});
stream.on("drain", () => {
process.emit("log4js:pause", false);

View File

@ -50,7 +50,8 @@ function fileAppender(file, layout, logSize, numBackups, options, timezoneOffset
opt
);
stream.on('error', (err) => {
console.error('log4js.fileAppender - Writing to file %s, error happened ', filePath, err); // eslint-disable-line
// eslint-disable-next-line no-console
console.error('log4js.fileAppender - Writing to file %s, error happened ', filePath, err);
});
stream.on('drain', () => {
process.emit("log4js:pause", false);

View File

@ -131,7 +131,7 @@ class RollingFileSync {
renameTheFiles();
}
/* eslint no-unused-vars:0 */
// eslint-disable-next-line no-unused-vars
write(chunk, encoding) {
const that = this;

View File

@ -24,7 +24,8 @@ const appenders = new Map();
const tryLoading = (modulePath, config) => {
debug('Loading module from ', modulePath);
try {
return require(modulePath); // eslint-disable-line
// eslint-disable-next-line global-require, import/no-dynamic-require
return require(modulePath);
} catch (e) {
// if the module was found, and we still got an error, then raise it
configuration.throwExceptionIf(
@ -83,7 +84,7 @@ const createAppender = (name, config) => {
}
debug(`${name}: clustering.isMaster ? ${clustering.isMaster()}`);
debug(`${name}: appenderModule is ${require('util').inspect(appenderModule)}`); // eslint-disable-line
debug(`${name}: appenderModule is ${require('util').inspect(appenderModule)}`); // eslint-disable-line global-require
return clustering.onlyOnMaster(() => {
debug(`calling appenderModule.configure for ${name} / ${appenderConfig.type}`);
return appenderModule.configure(

View File

@ -25,8 +25,7 @@ function logServer(config, actualAppender, levels) {
return loggingEvent;
}
/* eslint prefer-arrow-callback:0 */
const server = net.createServer(function connectionHandler(clientSocket) {
const server = net.createServer((clientSocket) => {
debug('(master) connection received');
clientSocket.setEncoding('utf8');
let logMessage = '';
@ -66,7 +65,7 @@ function logServer(config, actualAppender, levels) {
clientSocket.on('error', handleError);
});
server.listen(config.loggerPort || 5000, config.loggerHost || 'localhost', function (e) {
server.listen(config.loggerPort || 5000, config.loggerHost || 'localhost', (e) => {
debug('(master) master server listening, error was ', e);
// allow the process to exit, if this is the only socket active
server.unref();
@ -100,7 +99,6 @@ function workerAppender(config) {
function emptyBuffer() {
let evt;
debug('(worker) emptying worker buffer');
/* eslint no-cond-assign:0 */
while ((evt = buffer.shift())) {
write(evt);
}

View File

@ -18,7 +18,6 @@ function appender(config, layout) {
function emptyBuffer() {
let evt;
debug('emptying buffer');
/* eslint no-cond-assign:0 */
while ((evt = buffer.shift())) {
write(evt);
}

View File

@ -5,7 +5,8 @@ const configuration = require("./configuration");
let disabled = false;
let cluster = null;
try {
cluster = require("cluster"); // eslint-disable-line
// eslint-disable-next-line global-require
cluster = require("cluster");
} catch (e) {
debug("cluster module not present");
disabled = true;

View File

@ -1,4 +1,4 @@
/* eslint-disable no-plusplus */
/* eslint no-underscore-dangle: ["error", { "allow": ["__statusCode", "_remoteAddress", "__headers", "_logging"] }] */
const levels = require("./levels");
@ -37,9 +37,9 @@ function assembleTokens(req, res, customTokens) {
for (let i = 0; i < a.length; ++i) {
for (let j = i + 1; j < a.length; ++j) {
// not === because token can be regexp object
/* eslint eqeqeq:0 */
// eslint-disable-next-line eqeqeq
if (a[i].token == a[j].token) {
a.splice(j--, 1);
a.splice(j--, 1); // eslint-disable-line no-plusplus
}
}
}
@ -237,7 +237,6 @@ function matchRules(statusCode, currentLevel, ruleSet) {
* @api public
*/
module.exports = function getLogger(logger4js, options) {
/* eslint no-underscore-dangle:0 */
if (typeof options === "string" || typeof options === "function") {
options = { format: options };
} else {

View File

@ -271,7 +271,6 @@ function patternLayout(pattern, tokens) {
return loggingEvent.callStack || '';
}
/* eslint quote-props:0 */
const replacers = {
c: categoryName,
d: formatAsDate,
@ -340,7 +339,6 @@ function patternLayout(pattern, tokens) {
let result;
let searchString = pattern;
/* eslint no-cond-assign:0 */
while ((result = regex.exec(searchString)) !== null) {
// const matchedString = result[0];
const padding = result[1];

View File

@ -1,4 +1,5 @@
/* eslint no-underscore-dangle:0 */
/* eslint no-underscore-dangle: ["error", { "allow": ["_log"] }] */
const debug = require("debug")("log4js:logger");
const LoggingEvent = require("./LoggingEvent");
const levels = require("./levels");

View File

@ -48,7 +48,7 @@ test("LoggingEvent", batch => {
batch.test("Should correct construct with/without location info", t => {
// console.log([Error('123').stack.split('\n').slice(1).join('\n')])
const callStack =
" at repl:1:14\n at ContextifyScript.Script.runInThisContext (vm.js:50:33)\n at REPLServer.defaultEval (repl.js:240:29)\n at bound (domain.js:301:14)\n at REPLServer.runBound [as eval] (domain.js:314:12)\n at REPLServer.onLine (repl.js:468:10)\n at emitOne (events.js:121:20)\n at REPLServer.emit (events.js:211:7)\n at REPLServer.Interface._onLine (readline.js:280:10)\n at REPLServer.Interface._line (readline.js:629:8)"; // eslint-disable-line
" at repl:1:14\n at ContextifyScript.Script.runInThisContext (vm.js:50:33)\n at REPLServer.defaultEval (repl.js:240:29)\n at bound (domain.js:301:14)\n at REPLServer.runBound [as eval] (domain.js:314:12)\n at REPLServer.onLine (repl.js:468:10)\n at emitOne (events.js:121:20)\n at REPLServer.emit (events.js:211:7)\n at REPLServer.Interface._onLine (readline.js:280:10)\n at REPLServer.Interface._line (readline.js:629:8)"; // eslint-disable-line max-len
const fileName = "/log4js-node/test/tap/layouts-test.js";
const lineNumber = 1;
const columnNumber = 14;

View File

@ -257,7 +257,7 @@ test("log4js layouts", batch => {
// console.log([Error('123').stack.split('\n').slice(1).join('\n')])
const callStack =
" at repl:1:14\n at ContextifyScript.Script.runInThisContext (vm.js:50:33)\n at REPLServer.defaultEval (repl.js:240:29)\n at bound (domain.js:301:14)\n at REPLServer.runBound [as eval] (domain.js:314:12)\n at REPLServer.onLine (repl.js:468:10)\n at emitOne (events.js:121:20)\n at REPLServer.emit (events.js:211:7)\n at REPLServer.Interface._onLine (readline.js:280:10)\n at REPLServer.Interface._line (readline.js:629:8)"; // eslint-disable-line
" at repl:1:14\n at ContextifyScript.Script.runInThisContext (vm.js:50:33)\n at REPLServer.defaultEval (repl.js:240:29)\n at bound (domain.js:301:14)\n at REPLServer.runBound [as eval] (domain.js:314:12)\n at REPLServer.onLine (repl.js:468:10)\n at emitOne (events.js:121:20)\n at REPLServer.emit (events.js:211:7)\n at REPLServer.Interface._onLine (readline.js:280:10)\n at REPLServer.Interface._line (readline.js:629:8)"; // eslint-disable-line max-len
const fileName = path.normalize("/log4js-node/test/tap/layouts-test.js");
const lineNumber = 1;
const columnNumber = 14;