Make pion logger properly lazy

Author: IDisposable

internal/logging/pion.go

@@ -5,59 +5,57 @@ import (
 )
 
 type pionLogger struct {
-	logger *Context
+	logger func() *Context
 }
 
 func (c pionLogger) Trace(msg string) {
-	c.logger.Trace().Msg(msg)
+	c.logger().Trace().Msg(msg)
 }
 func (c pionLogger) Tracef(format string, args ...any) {
-	c.logger.Trace().Msgf(format, args...)
+	c.logger().Trace().Msgf(format, args...)
 }
 
 func (c pionLogger) Debug(msg string) {
-	c.logger.Debug().Msg(msg)
+	c.logger().Debug().Msg(msg)
 }
 func (c pionLogger) Debugf(format string, args ...any) {
-	c.logger.Debug().Msgf(format, args...)
+	c.logger().Debug().Msgf(format, args...)
 }
 
 func (c pionLogger) Info(msg string) {
-	c.logger.Info().Msg(msg)
+	c.logger().Info().Msg(msg)
 }
 func (c pionLogger) Infof(format string, args ...any) {
-	c.logger.Info().Msgf(format, args...)
+	c.logger().Info().Msgf(format, args...)
 }
 
 func (c pionLogger) Warn(msg string) {
-	c.logger.Warn().Msg(msg)
+	c.logger().Warn().Msg(msg)
 }
 func (c pionLogger) Warnf(format string, args ...any) {
-	c.logger.Warn().Msgf(format, args...)
+	c.logger().Warn().Msgf(format, args...)
 }
 
 func (c pionLogger) Error(msg string) {
-	c.logger.Error().Msg(msg)
+	c.logger().Error().Msg(msg)
 }
 func (c pionLogger) Errorf(format string, args ...any) {
-	c.logger.Error().Msgf(format, args...)
+	c.logger().Error().Msgf(format, args...)
 }
 
 // customLoggerFactory satisfies the interface logging.LoggerFactory
 // This allows us to create different loggers per subsystem. So we can
 // add custom behavior.
-type pionLoggerFactory struct{}
-
-func (c pionLoggerFactory) NewLogger(subsystem string) logging.LeveledLogger {
-	logger := GetSubsystemLogger("pion").
-		With().
-		Str("component", subsystem)
-
-	return pionLogger{logger: logger}
+type pionLoggerFactory struct {
+	subsystem string
 }
 
-var defaultLoggerFactory = &pionLoggerFactory{}
+func (c pionLoggerFactory) NewLogger(component string) logging.LeveledLogger {
+	return pionLogger{logger: func() *Context {
+		return GetSubsystemLogger(c.subsystem).Str("component", component)
+	}}
+}
 
-func GetPionDefaultLoggerFactory() logging.LoggerFactory {
-	return defaultLoggerFactory
+func GetPionLoggerFactory(subsystem string) logging.LoggerFactory {
+	return &pionLoggerFactory{subsystem: 
 }

internal/mdns/log.go

@@ -4,7 +4,7 @@ import (
 	"github.com/jetkvm/kvm/internal/logging"
 )
 
-func (m *MDNS) getMdnsLoggingContext() *logging.Context {
+func (m *MDNS) getMdnsLogger() *logging.Context {
 	return logging.GetSubsystemLogger("mdns").
 		Strs("local_names", m.localNames).
 		Bool("ipv4", m.listenOptions.IPv4).

internal/mdns/mdns.go

@@ -67,7 +67,7 @@ func (m *MDNS) start(allowRestart bool) error {
 		return fmt.Errorf("listen options not set")
 	}
 
-	context := m.getMdnsLoggingContext()
+	context := m.getMdnsLogger()
 
 	if !m.listenOptions.IPv4 && !m.listenOptions.IPv6 {
 		context.Info().Msg("mDNS server disabled")
@@ -120,7 +120,7 @@ func (m *MDNS) start(allowRestart bool) error {
 
 	mDNSConn, err := pion_mdns.Server(p4, p6, &pion_mdns.Config{
 		LocalNames:    newLocalNames,
-		LoggerFactory: logging.GetPionDefaultLoggerFactory(),
+		LoggerFactory: logging.GetPionLoggerFactory("mdns"),
 	})
 
 	context = context.Interface("mDNSConn", mDNSConn).Err(err)

pkg/nmlite/interface.go

@@ -102,8 +102,8 @@ func NewInterfaceManager(ctx context.Context, ifaceName string, config *types.Ne
 func (im *InterfaceManager) getLogger() *logging.Context {
 	logger := logging.GetSubsystemLogger("interface").Str("interface", im.ifaceName)
 
-	if logger.IsDebugLevel() {
-		logger = logger.Interface("state", im.state).Interface("linkState", im.linkState)
+	if logger.IsTraceLevel() {
+		logger = logger.Interface("state", im.state)
 	}
 
 	return logger

webrtc.go

@@ -200,7 +200,7 @@ func getOnHidMessageHandler(session *Session, loggingContext *logging.Context, c
 
 func newSession(config SessionConfig) (*Session, error) {
 	webrtcSettingEngine := webrtc.SettingEngine{
-		LoggerFactory: logging.GetPionDefaultLoggerFactory(),
+		LoggerFactory: logging.GetPionLoggerFactory("webrtc"),
 	}
 	iceServer := webrtc.ICEServer{}