Skip to content

Commit

Permalink
Merge pull request #1129 from log4js-node/update-deps
Browse files Browse the repository at this point in the history
chore(deps-dev): bump eslint-config-prettier from 6.15.0 to 8.3.0
  • Loading branch information
lamweili committed Jan 14, 2022
2 parents 53313ea + b303b30 commit 67d20e4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 31 deletions.
17 changes: 4 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -51,7 +51,7 @@
"deep-freeze": "0.0.1",
"eslint": "^5.16.0",
"eslint-config-airbnb-base": "^13.2.0",
"eslint-config-prettier": "^6.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-prettier": "^3.4.1",
Expand Down
8 changes: 2 additions & 6 deletions test/tap/file-sighup-test.js
Expand Up @@ -6,9 +6,7 @@ const sandbox = require("@log4js-node/sandboxed-module");
const removeFiles = async filenames => {
if (!Array.isArray(filenames))
filenames = [filenames];
const promises = filenames.map(filename => {
return fs.promises.unlink(filename);
});
const promises = filenames.map(filename => fs.promises.unlink(filename));
await Promise.allSettled(promises);
};

Expand Down Expand Up @@ -43,9 +41,7 @@ test("file appender single SIGHUP handler", t => {
t.teardown(async () => {
log4js.shutdown();

const filenames = Object.values(config.appenders).map(appender => {
return appender.filename;
});
const filenames = Object.values(config.appenders).map(appender => appender.filename);
await removeFiles(filenames);

process.off("warning", warningListener);
Expand Down
20 changes: 9 additions & 11 deletions test/tap/tcp-appender-test.js
Expand Up @@ -33,7 +33,7 @@ test("TCP Appender", batch => {

const serverConfig = {
endMsg: "__LOG4JS__",
deserialise: (log) => { return LoggingEvent.deserialise(log); }
deserialise: (log) => LoggingEvent.deserialise(log)
}
server = makeServer(serverConfig);

Expand Down Expand Up @@ -78,7 +78,7 @@ test("TCP Appender", batch => {

const serverConfig = {
endMsg: "\n",
deserialise: (log) => { return LoggingEvent.deserialise(log); }
deserialise: (log) => LoggingEvent.deserialise(log)
}
server = makeServer(serverConfig);

Expand Down Expand Up @@ -124,18 +124,16 @@ test("TCP Appender", batch => {

const serverConfig = {
endMsg: "__LOG4JS__",
deserialise: (log) => { return JSON.parse(log); }
deserialise: (log) => JSON.parse(log)
}
server = makeServer(serverConfig);

log4js.addLayout('json', function () {
return function (logEvent) {
return JSON.stringify({
"time": logEvent.startTime,
"message": logEvent.data[0],
"level": logEvent.level.toString()
});
}
log4js.addLayout('json', () => function (logEvent) {
return JSON.stringify({
"time": logEvent.startTime,
"message": logEvent.data[0],
"level": logEvent.level.toString()
});
});

server.listen(() => {
Expand Down

0 comments on commit 67d20e4

Please sign in to comment.