zeddemore-logger 1.0.0 → 1.0.2

package/lib/zeddemore-logger.js

@@ -118,10 +118,10 @@ class ZeddemoreLogger {
 
     /**
      * Create a Winston Logger
-     * @param options
+     * @param [options] {Object}
      * @returns {Logger}
      */
-    #createLogger = (options = { }) => {
+    createLogger = (options) => {
         options = options || { };
         return createWinstonLogger({
             format: this.#buildWinstonFormat(options, options.formats),
@@ -129,6 +129,25 @@ class ZeddemoreLogger {
         });
     }
 
+    createRequestLogger = (requestId = null, ipAddress = null) => {
+        requestId = requestId || this.#generateUuid();
+        const loggerOptions = { id: requestId };
+        if (ipAddress) loggerOptions.ip = ipAddress;
+        return this.createLogger(loggerOptions);
+    }
+
+    createUserLogger = (requestId = null, username = null, logLevel = this.defaultUserLogLevel, ipAddress = null) => {
+        requestId = requestId || this.#generateUuid();
+        logLevel = logLevel || this.defaultUserLogLevel;
+        const loggerOptions = { id: requestId, level: logLevel, user: username };
+        if (ipAddress) loggerOptions.ip = ipAddress;
+        return this.createLogger(loggerOptions);
+    }
+
+    #generateUuid() {
+        return uuid(null, null, null);
+    }
+
     #getRequestId = (req) => {
         if (!req) return null;
         return req[ this.requestIdAttribute ];
@@ -153,31 +172,12 @@ class ZeddemoreLogger {
         morgan.token('status-colored', (req, res) => { return buildStatusColoredToken(res); });
     }
 
-    #createRequestLogger = (requestId = null, ipAddress = null) => {
-        requestId = requestId || this.#generateUuid();
-        const loggerOptions = { id: requestId };
-        if (ipAddress) loggerOptions.ip = ipAddress;
-        return this.#createLogger(loggerOptions);
-    }
-
-    #createUserLogger = (requestId = null, username = null, logLevel = this.defaultUserLogLevel, ipAddress = null) => {
-        requestId = requestId || this.#generateUuid();
-        logLevel = logLevel || this.defaultUserLogLevel;
-        const loggerOptions = { id: requestId, level: logLevel, user: username };
-        if (ipAddress) loggerOptions.ip = ipAddress;
-        return this.#createLogger(loggerOptions);
-    }
-
-    #generateUuid() {
-        return uuid(null, null, null);
-    }
-
     static log(options) {
         options = options || { };
         const logger = options.logger || (options.user ? options.user.logger : null) || ((app && app.locals) ? app.locals.logger : null);
         if (logger) return logger;
         const zeddemoreLogger = new ZeddemoreLogger();
-        return zeddemoreLogger.#createLogger(options);
+        return zeddemoreLogger.createLogger(options);
     }
 
     morganMiddleware = (options) => {
@@ -210,7 +210,7 @@ class ZeddemoreLogger {
         res.header(rqh.REQUEST_ID, requestId);
         const ipAddress = requestValues.ipAddress;
         res.locals.user = res.locals.user || { };
-        res.locals.user.logger = this.#createRequestLogger(requestId, ipAddress);
+        res.locals.user.logger = this.createRequestLogger(requestId, ipAddress);
         return next();
     }
 
@@ -232,7 +232,7 @@ class ZeddemoreLogger {
         if (userLogLevel < 0) userLogLevel = this.logLevel;
         const level = this.forceLogLevel ? this.logLevel : userLogLevel;
         res.locals.user = res.locals.user || user;
-        res.locals.user.logger = this.#createUserLogger(requestId, username, level, ipAddress);
+        res.locals.user.logger = this.createUserLogger(requestId, username, level, ipAddress);
         return next();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zeddemore-logger",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Node.js Express logger using Morgan and Winston for thread and caller info tracking",
   "repository": {
     "type": "git",