feat(logger): 优化日志前缀和上下文字符串的解析逻辑

Author: muxiangqiu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change
 
+## 3.6.10
+
+- feat(logger): 优化日志前缀和上下文字符串的解析逻辑
+
 ## 3.6.9
 
 - feat(logger): 优化 WinstonLogger 初始化逻辑，避免重复创建 logger 实例

packages/core/src/common/logger/abstract-logger.ts

@@ -17,13 +17,24 @@ export abstract class AbstractLogger implements Logger {
         this.context = context;
     }
 
+    protected resolveContextString(context?: string): string {
+        if (this.context) {
+            return context ? `[${this.context}] [${context}] ` : `[${this.context}] `;
+        }
+        return context ? `[${context}] ` : '';
+    }
+
+    protected resolvePrefix(context?: string): string {
+        const time = new Date().toISOString();
+        return `${time} [${this.level}]`;
+    }
+
     protected log(message: any, context?: string, logFn: (...args: any[]) => void = console.info): void {
         context = context ?? this.context;
-        const time = new Date().toISOString();
         const traceId = this.traceIdProvider?.provide();
         const traceStr = traceId ? ` [trace: ${traceId}]` : '';
-        const contextStr = this.context ? ` [${this.context}]` : '';
-        logFn(`${time} [${this.level}]${traceStr}${contextStr} ${message}`);
+        const contextStr = this.resolveContextString(context);
+        logFn(`${this.resolvePrefix(context)}${traceStr}${contextStr} ${message}`);
         onLogEmitter.fire({
             level: this.level,
             traceId,
@@ -41,7 +52,7 @@ export abstract class AbstractLogger implements Logger {
         if (start !== undefined) {
             const duration = Date.now() - start;
             this.timeRecords.delete(label);
-            this.log(`${label}: ${duration}ms`, context);
+            this.log(`${label} [${duration}ms]`, context);
             return duration;
         } else {
             this.log(`No such label: ${label} for timeEnd`, context);

packages/logger/src/common/winston-logger.ts

@@ -58,6 +58,10 @@ export class WinstonLogger extends AbstractLogger {
         this.log(message, context, this.logger.debug.bind(this.logger));
     }
 
+    protected override resolvePrefix(context?: string): string {
+        return '';
+    }
+
     protected override log(message: any, context?: string, logFn?: (...args: any[]) => void): void {
         super.log(message, context, logFn ?? this.logger.info.bind(this.logger));
     }