From 3b2d1c2728a99947972ef24689cfc116e584bf02 Mon Sep 17 00:00:00 2001 From: Alexey Khit Date: Thu, 18 Aug 2022 17:26:11 +0300 Subject: [PATCH] Change ngrok candate log output --- cmd/ngrok/ngrok.go | 3 +++ cmd/webrtc/webrtc.go | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/ngrok/ngrok.go b/cmd/ngrok/ngrok.go index f9f54263..6df2d54c 100644 --- a/cmd/ngrok/ngrok.go +++ b/cmd/ngrok/ngrok.go @@ -46,6 +46,9 @@ func Init() { log.Warn().Err(err).Msg("[ngrok] add candidate") return } + + log.Info().Str("addr", address).Msg("[ngrok] add external candidate for WebRTC") + webrtc.AddCandidate(address) } } diff --git a/cmd/webrtc/webrtc.go b/cmd/webrtc/webrtc.go index 71746e4f..9c54da48 100644 --- a/cmd/webrtc/webrtc.go +++ b/cmd/webrtc/webrtc.go @@ -34,14 +34,14 @@ func Init() { address := cfg.Mod.Listen pionAPI, err := webrtc.NewAPI(address) if pionAPI == nil { - log.Error().Err(err).Msg("[webrtc] Init API") + log.Error().Err(err).Msg("[webrtc] init API") return } if err != nil { - log.Warn().Err(err).Msg("[webrtc] Listen") + log.Warn().Err(err).Msg("[webrtc] listen") } else if address != "" { - log.Info().Str("addr", address).Msg("[webrtc] Listen") + log.Info().Str("addr", address).Msg("[webrtc] listen") _, Port, _ = net.SplitHostPort(address) } @@ -63,7 +63,6 @@ func Init() { } func AddCandidate(address string) { - log.Info().Str("addr", address).Msg("[webrtc] new candidate") candidates = append(candidates, address) } @@ -238,6 +237,8 @@ func offerHandler(ctx *api.Context, msg *streamer.Message) { continue } address = ip.String() + address[4:] + + log.Debug().Str("addr", address).Msg("[webrtc] stun public address") } cand, err := webrtc.NewCandidate(address) @@ -259,7 +260,7 @@ func candidateHandler(ctx *api.Context, msg *streamer.Message) { return } if conn := ctx.Consumer.(*webrtc.Conn); conn != nil { - log.Trace().Str("candidate", msg.Value.(string)).Msg("[webrtc] Remote") + log.Trace().Str("candidate", msg.Value.(string)).Msg("[webrtc] remote") conn.Push(msg) } }