@athenna/logger 5.14.0 → 5.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "5.14.0",
+  "version": "5.15.0",
   "description": "The Athenna logging solution. Log in stdout, files and buckets.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

package/src/logger/Logger.d.ts

@@ -17,12 +17,7 @@ export declare class Logger extends Macroable {
      */
     private runtimeConfigs;
     /**
-     * Default message content that should be included
-     * in every structured log emitted by this instance.
-     */
-    private messageDefaults;
-    /**
-     * Store the current logger strategy so create()
+     * Store the current logger strategy so config() and create()
      * can clone the logger preserving its behavior.
      */
     private selection;
@@ -97,8 +92,7 @@ export declare class Logger extends Macroable {
      */
     private log;
     /**
-     * Attach message defaults to formatter configs so
-     * structured formatters can enrich the output.
+     * Rebuild drivers using the current logger selection.
      */
-    private withDefaultFormatterConfig;
+    private applySelection;
 }

package/src/logger/Logger.js

@@ -23,16 +23,11 @@ export class Logger extends Macroable {
          */
         this.runtimeConfigs = {};
         /**
-         * Default message content that should be included
-         * in every structured log emitted by this instance.
-         */
-        this.messageDefaults = {};
-        /**
-         * Store the current logger strategy so create()
+         * Store the current logger strategy so config() and create()
          * can clone the logger preserving its behavior.
          */
         this.selection = {
-            type: 'vanilla',
+            method: 'vanilla',
             values: []
         };
         this.channelOrVanilla(Config.get('logging.default'));
@@ -52,8 +47,8 @@ export class Logger extends Macroable {
      * formatters.
      */
     config(runtimeConfigs) {
-        this.runtimeConfigs = runtimeConfigs;
-        return this;
+        this.runtimeConfigs = Json.copy(runtimeConfigs || {});
+        return this.applySelection();
     }
     /**
      * Create a new logger instance inheriting the current
@@ -61,12 +56,16 @@ export class Logger extends Macroable {
      */
     create(defaults = {}) {
         const logger = new Logger();
-        logger.runtimeConfigs = Json.copy(this.runtimeConfigs);
-        logger.messageDefaults = {
-            ...Json.copy(this.messageDefaults),
-            ...Json.copy(defaults || {})
+        const runtimeConfigs = Json.copy(this.runtimeConfigs);
+        if (!runtimeConfigs.formatterConfig) {
+            runtimeConfigs.formatterConfig = {};
+        }
+        runtimeConfigs.formatterConfig.defaults = Json.copy(defaults);
+        logger.selection = {
+            method: this.selection.method,
+            values: Json.copy(this.selection.values)
         };
-        return logger[this.selection.type](...Json.copy(this.selection.values));
+        return logger.config(runtimeConfigs);
     }
     /**
      * Change the log channel.
@@ -74,12 +73,12 @@ export class Logger extends Macroable {
     channel(...channels) {
         this.drivers = [];
         this.selection = {
-            type: 'channel',
+            method: 'channel',
             values: [...channels]
         };
-        const runtimeConfigs = this.withDefaultFormatterConfig(this.runtimeConfigs);
         channels.forEach(channel => {
-            this.drivers.push(DriverFactory.fabricate(channel, runtimeConfigs));
+            const driver = DriverFactory.fabricate(channel, this.runtimeConfigs);
+            this.drivers.push(driver);
         });
         return this;
     }
@@ -91,15 +90,16 @@ export class Logger extends Macroable {
     vanilla(...configs) {
         this.drivers = [];
         this.selection = {
-            type: 'vanilla',
+            method: 'vanilla',
             values: Json.copy(configs)
         };
         if (!configs.length) {
-            this.drivers.push(DriverFactory.fabricateVanilla(this.withDefaultFormatterConfig()));
+            this.drivers.push(DriverFactory.fabricateVanilla(this.runtimeConfigs));
             return this;
         }
         configs.forEach(config => {
-            this.drivers.push(DriverFactory.fabricateVanilla(this.withDefaultFormatterConfig(config)));
+            const driver = DriverFactory.fabricateVanilla({ ...config, ...this.runtimeConfigs });
+            this.drivers.push(driver);
         });
         return this;
     }
@@ -175,22 +175,9 @@ export class Logger extends Macroable {
         return Promise.all(promises);
     }
     /**
-     * Attach message defaults to formatter configs so
-     * structured formatters can enrich the output.
+     * Rebuild drivers using the current logger selection.
      */
-    withDefaultFormatterConfig(configs = {}) {
-        if (!Object.keys(this.messageDefaults).length) {
-            return configs;
-        }
-        return {
-            ...configs,
-            formatterConfig: {
-                ...(configs.formatterConfig || {}),
-                defaults: {
-                    ...((configs.formatterConfig || {}).defaults || {}),
-                    ...this.messageDefaults
-                }
-            }
-        };
+    applySelection() {
+        return this[this.selection.method](...Json.copy(this.selection.values));
     }
 }