chore(lint): added linting to test files

log4js-node · Nov 13, 2017 · 906a774 · 906a774
1 parent b65871a
commit 906a774
Show file tree

Hide file tree

Showing 16 changed files with 277 additions and 323 deletions.
diff --git a/lib/configuration.js b/lib/configuration.js
@@ -8,7 +8,7 @@ const debug = require('debug')('log4js:configuration');
 
 let cluster;
 try {
-  cluster = require('cluster');   // eslint-disable-line global-require
+  cluster = require('cluster'); // eslint-disable-line global-require
 } catch (e) {
   debug('Clustering support disabled because require(cluster) threw an error: ', e);
 }
@@ -36,14 +36,12 @@ function anInteger(thing) {
 }
 
 class Configuration {
-
   throwExceptionIf(checks, message) {
     const tests = Array.isArray(checks) ? checks : [checks];
     tests.forEach((test) => {
       if (test) {
-        throw new Error(
-          `Problem with log4js configuration: (${util.inspect(this.candidate, { depth: 5 })}) - ${message}`
-        );
+        throw new Error(`Problem with log4js configuration: (${util.inspect(this.candidate, { depth: 5 })})` +
+          ` - ${message}`);
       }
     });
   }

diff --git a/lib/connect-logger.js b/lib/connect-logger.js
@@ -22,7 +22,7 @@ function getUrl(req) {
 }
 
 
-  /**
+/**
    * Adds custom {token, replacement} objects to defaults,
    * overwriting the defaults if any tokens clash
    *
@@ -37,8 +37,8 @@ function assembleTokens(req, res, customTokens) {
     const a = array.concat();
     for (let i = 0; i < a.length; ++i) {
       for (let j = i + 1; j < a.length; ++j) {
-          // not === because token can be regexp object
-          /* eslint eqeqeq:0 */
+        // not === because token can be regexp object
+        /* eslint eqeqeq:0 */
         if (a[i].token == a[j].token) {
           a.splice(j--, 1);
         }
@@ -91,15 +91,15 @@ function assembleTokens(req, res, customTokens) {
     token: /:res\[([^\]]+)]/g,
     replacement: function (_, field) {
       return res._headers ?
-               (res._headers[field.toLowerCase()] || res.__headers[field])
-          : (res.__headers && res.__headers[field]);
+        (res._headers[field.toLowerCase()] || res.__headers[field])
+        : (res.__headers && res.__headers[field]);
     }
   });
 
   return arrayUniqueTokens(customTokens.concat(defaultTokens));
 }
 
-  /**
+/**
    * Return formatted log line.
    *
    * @param  {String} str
@@ -114,7 +114,7 @@ function format(str, tokens) {
   return str;
 }
 
-  /**
+/**
    * Return RegExp Object about nolog
    *
    * @param  {String|Array} nolog
@@ -154,7 +154,7 @@ function createNoLogCondition(nolog) {
     }
 
     if (Array.isArray(nolog)) {
-        // convert to strings
+      // convert to strings
       const regexpsAsStrings = nolog.map(reg => (reg.source ? reg.source : reg));
       regexp = new RegExp(regexpsAsStrings.join('|'));
     }

diff --git a/lib/layouts.js b/lib/layouts.js
@@ -112,10 +112,10 @@ function timestampLevelAndCategory(loggingEvent, colour, timezoneOffset) {
  */
 function basicLayout(loggingEvent, timezoneOffset) {
   return timestampLevelAndCategory(
-      loggingEvent,
-      undefined,
-      timezoneOffset
-    ) + formatLogData(loggingEvent.data);
+    loggingEvent,
+    undefined,
+    timezoneOffset
+  ) + formatLogData(loggingEvent.data);
 }
 
 /**
@@ -124,10 +124,10 @@ function basicLayout(loggingEvent, timezoneOffset) {
  */
 function colouredLayout(loggingEvent, timezoneOffset) {
   return timestampLevelAndCategory(
-      loggingEvent,
-      loggingEvent.level.colour,
-      timezoneOffset
-    ) + formatLogData(loggingEvent.data);
+    loggingEvent,
+    loggingEvent.level.colour,
+    timezoneOffset
+  ) + formatLogData(loggingEvent.data);
 }
 
 function messagePassThroughLayout(loggingEvent) {

diff --git a/lib/levels.js b/lib/levels.js
@@ -36,7 +36,6 @@ module.exports = function (customLevels) {
       }
       return this.level === otherLevel.level;
     }
-
   }
 
   const defaultLevels = {

diff --git a/lib/log4js.js b/lib/log4js.js
@@ -31,7 +31,7 @@ const layouts = require('./layouts');
 
 let cluster;
 try {
-  cluster = require('cluster');   // eslint-disable-line global-require
+  cluster = require('cluster'); // eslint-disable-line global-require
 } catch (e) {
   debug('Clustering support disabled because require(cluster) threw an error: ', e);
 }
@@ -78,9 +78,8 @@ function setLevelForCategory(category, level) {
   debug(`setLevelForCategory: found ${categoryConfig} for ${category}`);
   if (!categoryConfig) {
     const sourceCategoryConfig = configForCategory(category);
-    debug(
-      `setLevelForCategory: no config found for category, found ${sourceCategoryConfig} for parents of ${category}`
-    );
+    debug('setLevelForCategory: no config found for category, found ' +
+      `${sourceCategoryConfig} for parents of ${category}`);
     categoryConfig = { appenders: sourceCategoryConfig.appenders };
   }
   categoryConfig.level = level;
@@ -207,21 +206,19 @@ function configure(configurationFileOrObject) {
 
   if (config.disableClustering) {
     debug('Not listening for cluster messages, because clustering disabled.');
-  } else {
+  } else if (isPM2Master()) {
     // PM2 cluster support
     // PM2 runs everything as workers - install pm2-intercom for this to work.
     // we only want one of the app instances to write logs
-    if (isPM2Master()) {
-      debug('listening for PM2 broadcast messages');
-      process.removeListener('message', receiver);
-      process.on('message', receiver);
-    } else if (cluster.isMaster) {
-      debug('listening for cluster messages');
-      cluster.removeListener('message', receiver);
-      cluster.on('message', receiver);
-    } else {
-      debug('not listening for messages, because we are not a master process');
-    }
+    debug('listening for PM2 broadcast messages');
+    process.removeListener('message', receiver);
+    process.on('message', receiver);
+  } else if (cluster.isMaster) {
+    debug('listening for cluster messages');
+    cluster.removeListener('message', receiver);
+    cluster.on('message', receiver);
+  } else {
+    debug('not listening for messages, because we are not a master process');
   }
 
   enabled = true;

diff --git a/lib/logger.js b/lib/logger.js
@@ -6,7 +6,7 @@ const debug = require('debug')('log4js:logger');
 
 let cluster;
 try {
-  cluster = require('cluster');   // eslint-disable-line global-require
+  cluster = require('cluster'); // eslint-disable-line global-require
 } catch (e) {
   debug('Clustering support disabled because require(cluster) threw an error: ', e);
 }

diff --git a/package.json b/package.json
@@ -25,11 +25,10 @@
   },
   "scripts": {
     "clean": "find test -type f ! -name '*.json' ! -name '*.js' ! -name '.eslintrc' -delete && rm *.log",
-    "lint": "eslint lib/ test/",
     "prepush": "npm test",
     "commitmsg": "validate-commit-msg",
     "posttest": "npm run clean",
-    "pretest": "eslint lib/**/*",
+    "pretest": "eslint 'lib/**/*.js' 'test/**/*.js'",
     "test": "tap 'test/tap/**/*.js'",
     "coverage": "tap 'test/tap/**/*.js' --cov",
     "codecov": "tap 'test/tap/**/*.js' --cov --coverage-report=lcov && codecov"