@abtnode/logger 1.16.21-beta-445a8baa → 1.16.21-beta-2e75c75c

package/lib/logger.js

@@ -47,29 +47,32 @@ const getNoopLogger = (label = '') => {
 // singleton per process
 let addedRejectionExceptionTransport = false;
 
-const customPrintfCallback = ({ level, message, label, timestamp, metadata, [Symbol.for('splat')]: splat }) => {
-  let result = `[${process.pid}] [${timestamp}] [${level}]`;
-  if (label) {
-    result = `${result} [${label}]`;
-  }
-
-  if (!isEmpty(message)) {
-    result = `${result} [${message}]`;
-  }
+// 目前的实现不支持 splat, 但是我测试了好多次，但是依然没搞明白为什么 splat 中包含了所有的 metadata
+const customPrintfCallback = ({ level, message, label, timestamp, [Symbol.for('splat')]: metadata }) => {
+  let result = `[${process.pid}] [${timestamp}] [${level}] [${label || 'default'}] [${message || ''}]`;
+
+  let newMetadata = metadata;
+  if (!isEmpty(newMetadata)) {
+    newMetadata = newMetadata.map((d) => {
+      if (d instanceof Error) {
+        return {
+          error: d.message,
+          error_stack: d.stack,
+        };
+      }
 
-  let newMetaData = metadata;
-  if (isEmpty(newMetaData) && !isEmpty(splat)) {
-    newMetaData = { data: splat[0] };
-  }
+      if (d.error) {
+        d.error = {
+          error: d.error.message,
+          error_stack: d.error.stack,
+        };
+        return d;
+      }
 
-  if (!isEmpty(newMetaData)) {
-    if (newMetaData.error && newMetaData.error instanceof Error) {
-      const { error } = newMetaData;
-      newMetaData.error = error.message;
-      newMetaData.error_stack = error.stack;
-    }
+      return d;
+    });
 
-    result = `${result} ${safeStringify(newMetaData)}`;
+    result = `${result} ${safeStringify(newMetadata)}`;
   }
 
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/logger",
-  "version": "1.16.21-beta-445a8baa",
+  "version": "1.16.21-beta-2e75c75c",
   "description": "ABT Node logger lib",
   "keywords": [
     "logger",
@@ -34,7 +34,7 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.21-beta-445a8baa",
+    "@abtnode/constant": "1.16.21-beta-2e75c75c",
     "debug": "^4.3.4",
     "fast-safe-stringify": "^2.1.1",
     "fs-extra": "^10.1.0",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "express": "^4.18.2"
   },
-  "gitHead": "7a7ff8be7f424775c3bde0eead773d8e6177fa1a"
+  "gitHead": "1fca0b58e1ed4f7a9bb268829a7c84290a01c89d"
 }