fix: connectLogger nolog

log4js-node · Jul 8, 2022 · 25eacc9 · 25eacc9
1 parent 4351519
commit 25eacc9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/.husky/pre-push b/.husky/pre-push
diff --git a/lib/connect-logger.js b/lib/connect-logger.js
@@ -208,25 +208,6 @@ function matchRules(statusCode, currentLevel, ruleSet) {
   return level;
 }
 
-/**
- * Log skipping check
- *
- * @param  {IncomingMessage} req
- * @param  {ServerResponse} res
- * @param  {Array|string|RegExp|Function} nolog
- * @return {boolean}
- * @api private
- */
-function shouldSkip(req, res, nolog) {
-  if (typeof nolog === 'function') {
-    if (nolog(req, res) === true) return true;
-  } else {
-    const regexp = createNoLogCondition(nolog);
-    if (regexp && regexp.test(req.originalUrl)) return true;
-  }
-  return false;
-}
-
 /**
  * Log requests with the given `options` or a `format` string.
  *
@@ -270,10 +251,13 @@ module.exports = function getLogger(logger4js, options) {
 
   return (req, res, next) => {
     // mount safety
-    if (req._logging) return next();
+    if (req._logging !== undefined) return next();
 
     // nologs
-    if (shouldSkip(req, res, options.nolog)) return next();
+    if (typeof options.nolog !== 'function') {
+      const nolog = createNoLogCondition(options.nolog);
+      if (nolog && nolog.test(req.originalUrl)) return next();
+    }
 
     if (thisLogger.isLevelEnabled(level) || options.level === 'auto') {
       const start = new Date();
@@ -300,9 +284,11 @@ module.exports = function getLogger(logger4js, options) {
         finished = true;
 
         // nologs
-        if (shouldSkip(req, res, options.nolog)) {
-          req._logging = false;
-          return;
+        if (typeof options.nolog === 'function') {
+          if (options.nolog(req, res) === true) {
+            req._logging = false;
+            return;
+          }
         }
 
         res.responseTime = new Date() - start;

diff --git a/test/tap/configuration-validation-test.js b/test/tap/configuration-validation-test.js
@@ -274,7 +274,9 @@ test('log4js configuration validation', (batch) => {
         })
       )
     );
-    t.end();
+    log4js.shutdown(() => {
+      t.end();
+    });
   });
 
   batch.test('should load appenders from core first', (t) => {