From 3c31de35893ea1129008bfb30db0ed3757396824 Mon Sep 17 00:00:00 2001 From: Gareth Date: Fri, 23 Aug 2019 08:11:26 +1000 Subject: [PATCH] chore: updated streamroller dep, fixed test on windows --- lib/appenders/file.js | 4 +--- package-lock.json | 15 ++++----------- package.json | 2 +- test/tap/fileAppender-test.js | 1 + 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/appenders/file.js b/lib/appenders/file.js index 0b9ca5f..8e06a91 100644 --- a/lib/appenders/file.js +++ b/lib/appenders/file.js @@ -64,9 +64,7 @@ function fileAppender(file, layout, logSize, numBackups, options, timezoneOffset app.shutdown = function (complete) { process.removeListener('SIGHUP', app.sighupHandler); - writer.write('', 'utf-8', () => { - writer.end(complete); - }); + writer.end('', 'utf-8', complete); }; // On SIGHUP, close and reopen all files. This allows this appender to work with diff --git a/package-lock.json b/package-lock.json index a2f420c..013fbae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3523,20 +3523,13 @@ "dev": true }, "streamroller": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.0.0.tgz", - "integrity": "sha512-F3YGsrfLJMqS2QB5NEV1qd8ZluCNw+srK3t/q3odEwXpy+FF9uR7pPg9YiJxi7jKKahMdZBPBL668lf3Lnk43A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.1.0.tgz", + "integrity": "sha512-Ps7CuQL0RRG0YAigxNehrGfHrLu+jKSSnhiZBwF8uWi62WmtHDQV1OG5gVgV5SAzitcz1GrM3QVgnRO0mXV2hg==", "requires": { "date-format": "^2.1.0", "debug": "^4.1.1", "fs-extra": "^8.1.0" - }, - "dependencies": { - "date-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==" - } } }, "string-width": { @@ -5089,7 +5082,7 @@ "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=" + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, "uri-js": { "version": "4.2.2", diff --git a/package.json b/package.json index 4f6ec16..11030bb 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "debug": "^4.1.1", "flatted": "^2.0.1", "rfdc": "^1.1.4", - "streamroller": "^2.0.0" + "streamroller": "^2.1.0" }, "devDependencies": { "@log4js-node/sandboxed-module": "^2.2.1", diff --git a/test/tap/fileAppender-test.js b/test/tap/fileAppender-test.js index c78cef9..1654bde 100644 --- a/test/tap/fileAppender-test.js +++ b/test/tap/fileAppender-test.js @@ -25,6 +25,7 @@ test("log4js fileAppender", batch => { await removeFile(testFile); t.tearDown(async () => { + await new Promise(resolve => log4js.shutdown(resolve)); await removeFile(testFile); });