log: Fix logger name duplication in zap adapter

Author: foxcpp

framework/log/log.go

@@ -251,6 +251,21 @@ func (l *Logger) log(debug bool, s string) {
 	// Logging is disabled - do nothing.
 }
 
+func (l *Logger) logNameOverwrite(loggerName string, debug bool, s string) {
+	if loggerName == "" {
+		loggerName = l.Name
+	}
+	if loggerName != "" {
+		s = loggerName + ": " + s
+	}
+
+	out := l.output()
+	out.Write(time.Now(), debug, s)
+
+	// Logging is disabled - do nothing.
+}
+
+
 func (l *Logger) Sublogger(name string) *Logger {
 	if l.Name != "" && name != "" {
 		name = l.Name + "/" + name

framework/log/zap.go

@@ -46,9 +46,14 @@ func (l zapLogger) Write(entry zapcore.Entry, fields []zapcore.Field) error {
 		f.AddTo(enc)
 	}
 	if entry.LoggerName != "" {
-		l.L.Name += "/" + entry.LoggerName
+		l.L.logNameOverwrite(
+			l.L.Name+"/"+entry.LoggerName,
+			entry.Level == zapcore.DebugLevel,
+			l.L.formatMsg(entry.Message, enc.Fields),
+		)
+	} else {
+		l.L.log(entry.Level == zapcore.DebugLevel, l.L.formatMsg(entry.Message, enc.Fields))
 	}
-	l.L.log(entry.Level == zapcore.DebugLevel, l.L.formatMsg(entry.Message, enc.Fields))
 	return nil
 }