Add pion logging

kylecarbs · kylecarbs · commit 93ce57e5126c · 2022-01-31T01:38:08.000Z
diff --git a/peer/conn.go b/peer/conn.go
@@ -9,7 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pion/logging"
 	"github.com/pion/webrtc/v3"
 	"go.uber.org/atomic"
 	"golang.org/x/xerrors"
@@ -52,9 +51,7 @@ func newWithClientOrServer(servers []webrtc.ICEServer, client bool, opts *ConnOp
 	// Enables preference to STUN.
 	opts.SettingEngine.SetSrflxAcceptanceMinWait(0)
 	opts.SettingEngine.DetachDataChannels()
-	lf := logging.NewDefaultLoggerFactory()
-	lf.DefaultLogLevel = logging.LogLevelDisabled
-	opts.SettingEngine.LoggerFactory = lf
+	opts.SettingEngine.LoggerFactory = &pionLoggerFactory{opts.Logger}
 	api := webrtc.NewAPI(webrtc.WithSettingEngine(opts.SettingEngine))
 	rtc, err := api.NewPeerConnection(webrtc.Configuration{
 		ICEServers: servers,
@@ -224,6 +221,10 @@ func (c *Conn) init() error {
 		c.opts.Logger.Debug(context.Background(), "dtls transport state updated",
 			slog.F("state", dtlsTransportState))
 	})
+	c.rtc.SCTP().Transport().ICETransport().OnSelectedCandidatePairChange(func(candidatePair *webrtc.ICECandidatePair) {
+		c.opts.Logger.Debug(context.Background(), "selected candidate pair changed",
+			slog.F("local", candidatePair.Local), slog.F("remote", candidatePair.Remote))
+	})
 	c.rtc.OnICECandidate(func(iceCandidate *webrtc.ICECandidate) {
 		if iceCandidate == nil {
 			return
diff --git a/peer/logger.go b/peer/logger.go
@@ -0,0 +1,54 @@
+package peer
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/pion/logging"
+
+	"cdr.dev/slog"
+)
+
+type pionLoggerFactory struct {
+	Logger slog.Logger
+}
+
+func (p *pionLoggerFactory) NewLogger(_ string) logging.LeveledLogger {
+	return &pionLogger{
+		Logger: p.Logger.Named("pion"),
+	}
+}
+
+type pionLogger struct {
+	Logger slog.Logger
+}
+
+// These are too verbose!
+func (*pionLogger) Trace(_ string)                    {}
+func (*pionLogger) Tracef(_ string, _ ...interface{}) {}
+func (*pionLogger) Debug(_ string)                    {}
+func (*pionLogger) Debugf(_ string, _ ...interface{}) {}
+
+func (p *pionLogger) Info(msg string) {
+	p.Logger.Info(context.Background(), msg)
+}
+
+func (p *pionLogger) Infof(format string, args ...interface{}) {
+	p.Logger.Info(context.Background(), fmt.Sprintf(format, args...))
+}
+
+func (p *pionLogger) Warn(msg string) {
+	p.Logger.Warn(context.Background(), msg)
+}
+
+func (p *pionLogger) Warnf(format string, args ...interface{}) {
+	p.Logger.Warn(context.Background(), fmt.Sprintf(format, args...))
+}
+
+func (p *pionLogger) Error(msg string) {
+	p.Logger.Error(context.Background(), msg)
+}
+
+func (p *pionLogger) Errorf(format string, args ...interface{}) {
+	p.Logger.Error(context.Background(), fmt.Sprintf(format, args...))
+}
