From 8b442994545b2fef1f03a08519bcf6de533ddd7f Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Wed, 2 Feb 2022 03:05:42 +0800 Subject: [PATCH 1/3] Fixes #1086 --- lib/appenders/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/appenders/index.js b/lib/appenders/index.js index db6a8b0..c31f470 100644 --- a/lib/appenders/index.js +++ b/lib/appenders/index.js @@ -39,7 +39,7 @@ const tryLoading = (modulePath, config) => { const loadAppenderModule = (type, config) => coreAppenders.get(type) || tryLoading(`./${type}`, config) || tryLoading(type, config) - || (require.main && tryLoading(path.join(path.dirname(require.main.filename), type), config)) + || (require.main && require.main.filename && tryLoading(path.join(path.dirname(require.main.filename), type), config)) || tryLoading(path.join(process.cwd(), type), config); const appendersLoading = new Set(); From 57c90259132c27604b030b0c10aa3dda8f99af97 Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Wed, 2 Feb 2022 03:06:07 +0800 Subject: [PATCH 2/3] Fixes #1029 --- lib/appenders/logLevelFilter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/appenders/logLevelFilter.js b/lib/appenders/logLevelFilter.js index 7c9012c..253fedd 100644 --- a/lib/appenders/logLevelFilter.js +++ b/lib/appenders/logLevelFilter.js @@ -3,7 +3,7 @@ function logLevelFilter(minLevelString, maxLevelString, appender, levels) { const maxLevel = levels.getLevel(maxLevelString, levels.FATAL); return (logEvent) => { const eventLevel = logEvent.level; - if (eventLevel.isGreaterThanOrEqualTo(minLevel) && eventLevel.isLessThanOrEqualTo(maxLevel)) { + if (minLevel.isLessThanOrEqualTo(eventLevel) && maxLevel.isGreaterThanOrEqualTo(eventLevel)) { appender(logEvent); } }; From eb9c923b04c899fa28e85ae6f1807f3e7fdaa536 Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Wed, 2 Feb 2022 03:06:22 +0800 Subject: [PATCH 3/3] Misc formatting --- lib/appenders/dateFile.js | 2 +- lib/appenders/file.js | 2 +- lib/appenders/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/appenders/dateFile.js b/lib/appenders/dateFile.js index 3f1ffc4..8999c74 100644 --- a/lib/appenders/dateFile.js +++ b/lib/appenders/dateFile.js @@ -10,7 +10,7 @@ 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 + console.error('log4js.dateFileAppender - Writing to file %s, error happened ', filename, err); // eslint-disable-line }); stream.on("drain", () => { process.emit("log4js:pause", false); diff --git a/lib/appenders/file.js b/lib/appenders/file.js index e976a29..aeccddb 100644 --- a/lib/appenders/file.js +++ b/lib/appenders/file.js @@ -21,7 +21,7 @@ function openTheStream(file, fileSize, numFiles, options) { options ); stream.on('error', (err) => { - console.error('log4js.fileAppender - Writing to file %s, error happened ', file, err); //eslint-disable-line + console.error('log4js.fileAppender - Writing to file %s, error happened ', file, err); // eslint-disable-line }); stream.on('drain', () => { process.emit("log4js:pause", false); diff --git a/lib/appenders/index.js b/lib/appenders/index.js index c31f470..58b10c1 100644 --- a/lib/appenders/index.js +++ b/lib/appenders/index.js @@ -24,7 +24,7 @@ const appenders = new Map(); const tryLoading = (modulePath, config) => { debug('Loading module from ', modulePath); try { - return require(modulePath); //eslint-disable-line + return require(modulePath); // eslint-disable-line } catch (e) { // if the module was found, and we still got an error, then raise it configuration.throwExceptionIf(