diff --git a/lib/LoggingEvent.js b/lib/LoggingEvent.js index 42a2656..4d36cb9 100644 --- a/lib/LoggingEvent.js +++ b/lib/LoggingEvent.js @@ -19,7 +19,7 @@ class LoggingEvent { this.categoryName = categoryName; this.data = data; this.level = level; - this.context = Object.assign({}, context); + this.context = Object.assign({}, context); // eslint-disable-line prefer-object-spread this.pid = process.pid; if (location) { @@ -37,6 +37,7 @@ class LoggingEvent { // The following allows us to serialize errors correctly. // duck-typing for Error object if (value && value.message && value.stack) { + // eslint-disable-next-line prefer-object-spread value = Object.assign({message: value.message, stack: value.stack}, value); } // JSON.stringify({a: parseInt('abc'), b: 1/0, c: -1/0}) returns {a: null, b: null, c: null}. diff --git a/lib/appenders/adapters.js b/lib/appenders/adapters.js index 1ec15b8..727196a 100644 --- a/lib/appenders/adapters.js +++ b/lib/appenders/adapters.js @@ -20,7 +20,7 @@ function maxFileSizeUnitTransform(maxLogSize) { } function adapter(configAdapter, config) { - const newConfig = Object.assign({}, config); + const newConfig = Object.assign({}, config); // eslint-disable-line prefer-object-spread Object.keys(configAdapter).forEach((key) => { if (newConfig[key]) { newConfig[key] = configAdapter[key](config[key]); diff --git a/package.json b/package.json index f31e390..b1125c6 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "codecov": "^3.8.3", "deep-freeze": "0.0.1", "eslint": "^8.11.0", - "eslint-config-airbnb-base": "^13.2.0", + "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.4.0", "eslint-import-resolver-node": "^0.3.6", "eslint-plugin-import": "^2.25.4", diff --git a/test/tap/connect-context-test.js b/test/tap/connect-context-test.js index 97bcad2..ea8dfd8 100644 --- a/test/tap/connect-context-test.js +++ b/test/tap/connect-context-test.js @@ -1,3 +1,5 @@ +/* eslint max-classes-per-file: ["error", 2] */ + const { test } = require("tap"); const EE = require("events").EventEmitter; const levels = require("../../lib/levels"); @@ -10,7 +12,7 @@ class MockLogger { } log() { - this.contexts.push(Object.assign({}, this.context)); + this.contexts.push(Object.assign({}, this.context)); // eslint-disable-line prefer-object-spread } isLevelEnabled(level) { diff --git a/test/tap/connect-logger-test.js b/test/tap/connect-logger-test.js index b53673f..7bc747e 100644 --- a/test/tap/connect-logger-test.js +++ b/test/tap/connect-logger-test.js @@ -1,3 +1,5 @@ +/* eslint max-classes-per-file: ["error", 2] */ + const { test } = require("tap"); const EE = require("events").EventEmitter; const levels = require("../../lib/levels"); diff --git a/test/tap/connect-nolog-test.js b/test/tap/connect-nolog-test.js index 1e33948..b53228e 100644 --- a/test/tap/connect-nolog-test.js +++ b/test/tap/connect-nolog-test.js @@ -1,3 +1,5 @@ +/* eslint max-classes-per-file: ["error", 2] */ + const { test } = require("tap"); const EE = require("events").EventEmitter; const levels = require("../../lib/levels"); diff --git a/test/tap/dateFileAppender-test.js b/test/tap/dateFileAppender-test.js index 183df14..fa5e028 100644 --- a/test/tap/dateFileAppender-test.js +++ b/test/tap/dateFileAppender-test.js @@ -1,3 +1,5 @@ +/* eslint max-classes-per-file: ["error", 3] */ + const { test } = require("tap"); const path = require("path"); const fs = require("fs"); diff --git a/test/tap/file-descriptor-leak-test.js b/test/tap/file-descriptor-leak-test.js index 6a899f8..da2924d 100644 --- a/test/tap/file-descriptor-leak-test.js +++ b/test/tap/file-descriptor-leak-test.js @@ -68,7 +68,7 @@ if (process.platform !== "win32") { }); batch.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); const filenames = Object.values(config.appenders).map(appender => appender.filename); await removeFiles(filenames); diff --git a/test/tap/file-sighup-test.js b/test/tap/file-sighup-test.js index 5a9da56..f883e3d 100644 --- a/test/tap/file-sighup-test.js +++ b/test/tap/file-sighup-test.js @@ -39,7 +39,7 @@ test("file appender single SIGHUP handler", t => { log4js.configure(config); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); const filenames = Object.values(config.appenders).map(appender => appender.filename); await removeFiles(filenames); diff --git a/test/tap/fileAppender-test.js b/test/tap/fileAppender-test.js index c0cb991..5ca1f6a 100644 --- a/test/tap/fileAppender-test.js +++ b/test/tap/fileAppender-test.js @@ -1,3 +1,5 @@ +/* eslint max-classes-per-file: ["error", 2] */ + const { test } = require("tap"); const fs = require("fs-extra"); const path = require("path"); @@ -25,7 +27,7 @@ test("log4js fileAppender", batch => { await removeFile(testFile); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFile(testFile); }); @@ -73,7 +75,7 @@ test("log4js fileAppender", batch => { await removeFile(testFile); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFile(testFile); }); @@ -86,7 +88,7 @@ test("log4js fileAppender", batch => { logger.info("2"); logger.info("3"); - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); const fileContents = await fs.readFile(testFile, "utf8"); // 3 lines of output, plus the trailing newline. t.equal(fileContents.split(EOL).length, 4); @@ -103,7 +105,7 @@ test("log4js fileAppender", batch => { await removeFile(testFile); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFile(testFile); }); @@ -165,7 +167,7 @@ test("log4js fileAppender", batch => { await Promise.all([removeFile(testFile), removeFile(`${testFile}.1`)]); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await Promise.all([removeFile(testFile), removeFile(`${testFile}.1`)]); }); @@ -217,7 +219,7 @@ test("log4js fileAppender", batch => { ]); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await Promise.all([ removeFile(testFile), removeFile(`${testFile}.1`), @@ -277,7 +279,7 @@ test("log4js fileAppender", batch => { ]); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await Promise.all([ removeFile(testFile), removeFile(`${testFile}.1.gz`), @@ -443,7 +445,7 @@ test("log4js fileAppender", batch => { await removeFile(testFileAsIs); t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFile(testFilePlain); await removeFile(testFileAsIs); }); diff --git a/test/tap/multi-file-appender-test.js b/test/tap/multi-file-appender-test.js index 038ccdc..1e0be19 100644 --- a/test/tap/multi-file-appender-test.js +++ b/test/tap/multi-file-appender-test.js @@ -75,7 +75,7 @@ test("multiFile appender", batch => { batch.test("should close file after timeout", t => { t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFiles("logs/C.log"); }); /* checking that the file is closed after a timeout is done by looking at the debug logs @@ -123,7 +123,7 @@ test("multiFile appender", batch => { batch.test("should close file safely after timeout", t => { t.teardown(async () => { - await new Promise(resolve => sandboxedLog4js.shutdown(resolve)); // eslint-disable-line no-use-before-define + await new Promise(resolve => { sandboxedLog4js.shutdown(resolve); }); // eslint-disable-line no-use-before-define await removeFiles("logs/C.log"); }); const error = new Error("fileAppender shutdown error"); @@ -195,7 +195,7 @@ test("multiFile appender", batch => { batch.test("should close file after extended timeout", t => { t.teardown(async () => { - await new Promise(resolve => log4js.shutdown(resolve)); + await new Promise(resolve => { log4js.shutdown(resolve); }); await removeFiles("logs/D.log"); }); /* checking that the file is closed after a timeout is done by looking at the debug logs diff --git a/test/tap/server-test.js b/test/tap/server-test.js index d56c282..69c7061 100644 --- a/test/tap/server-test.js +++ b/test/tap/server-test.js @@ -100,10 +100,8 @@ test("TCP Server", batch => { // give the socket a chance to start up setTimeout(() => { const socket = net.connect(5000, () => { - const syncWrite = (dataArray = [], finalCallback) => { - if (dataArray === null) { - dataArray = []; - } else if (!Array.isArray(dataArray)) { + const syncWrite = (dataArray, finalCallback) => { + if (!Array.isArray(dataArray)) { dataArray = [dataArray]; } if (typeof finalCallback !== "function") {