mirror of
https://github.com/netbirdio/netbird.git
synced 2025-06-21 18:22:37 +02:00
- add ip to log
- remove unused timestamp from log
This commit is contained in:
parent
233a7b9802
commit
f3282bea80
@ -340,7 +340,6 @@ func (conn *Conn) reconnectLoopWithRetry() {
|
|||||||
|
|
||||||
<-ticker.C // consume the initial tick what is happening right after the ticker has been created
|
<-ticker.C // consume the initial tick what is happening right after the ticker has been created
|
||||||
|
|
||||||
no := time.Now()
|
|
||||||
L:
|
L:
|
||||||
for {
|
for {
|
||||||
select {
|
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
|
// 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
|
// 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))
|
conn.log.Tracef("ticker timedout, relay state: %s, ice state: %s", conn.statusRelay, conn.statusICE)
|
||||||
no = time.Now()
|
|
||||||
|
|
||||||
if conn.statusRelay == StatusConnected && conn.statusICE == StatusConnected {
|
if conn.statusRelay == StatusConnected && conn.statusICE == StatusConnected {
|
||||||
continue
|
continue
|
||||||
|
@ -67,7 +67,7 @@ func (l *Listener) Close() error {
|
|||||||
func (l *Listener) onAccept(w http.ResponseWriter, r *http.Request) {
|
func (l *Listener) onAccept(w http.ResponseWriter, r *http.Request) {
|
||||||
wsConn, err := websocket.Accept(w, r, nil)
|
wsConn, err := websocket.Accept(w, r, nil)
|
||||||
if err != 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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user