From f3282bea80233a2c7dabe9a061714bde25cd1fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= Date: Thu, 18 Jul 2024 13:11:27 +0200 Subject: [PATCH] - add ip to log - remove unused timestamp from log --- client/internal/peer/conn.go | 4 +--- relay/server/listener/ws/listener.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/internal/peer/conn.go b/client/internal/peer/conn.go index d90c41e5f..721d5d036 100644 --- a/client/internal/peer/conn.go +++ b/client/internal/peer/conn.go @@ -340,7 +340,6 @@ func (conn *Conn) reconnectLoopWithRetry() { <-ticker.C // consume the initial tick what is happening right after the ticker has been created - no := time.Now() L: for { select { @@ -351,8 +350,7 @@ func (conn *Conn) reconnectLoopWithRetry() { } // checks if there is peer connection is established via relay or ice and that it has a wireguard handshake and skip offer // todo check wg handshake - conn.log.Tracef("ticker timedout, relay state: %s, ice state: %s, elapsed time: %s", conn.statusRelay, conn.statusICE, time.Since(no)) - no = time.Now() + conn.log.Tracef("ticker timedout, relay state: %s, ice state: %s", conn.statusRelay, conn.statusICE) if conn.statusRelay == StatusConnected && conn.statusICE == StatusConnected { continue diff --git a/relay/server/listener/ws/listener.go b/relay/server/listener/ws/listener.go index 6b2f669f4..51a578dc4 100644 --- a/relay/server/listener/ws/listener.go +++ b/relay/server/listener/ws/listener.go @@ -67,7 +67,7 @@ func (l *Listener) Close() error { func (l *Listener) onAccept(w http.ResponseWriter, r *http.Request) { wsConn, err := websocket.Accept(w, r, nil) if err != nil { - log.Errorf("failed to accept ws connection: %s", err) + log.Errorf("failed to accept ws connection from %s: %s", r.RemoteAddr, err) return }