benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

increase dial timeout + debug logs

Browse Source
This commit is contained in:
Sergey Cherepanov 2023-02-15 14:58:23 +03:00
parent 3b837b4b6b
commit 4d356318f0
No known key found for this signature in database
GPG Key ID: 87F8EDE8FBDF637C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dialer/dialer.go
View File

@ -3,6 +3,7 @@ package dialer
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"github.com/anytypeio/any-sync/app" "github.com/anytypeio/any-sync/app"
"github.com/anytypeio/any-sync/app/logger" "github.com/anytypeio/any-sync/app/logger"
net2 "github.com/anytypeio/any-sync/net" net2 "github.com/anytypeio/any-sync/net"
@ -100,15 +101,17 @@ func (d *dialer) Dial(ctx context.Context, peerId string) (p peer.Peer, err erro
} }
func (d *dialer) handshake(ctx context.Context, addr string) (conn drpc.Conn, sc sec.SecureConn, err error) { func (d *dialer) handshake(ctx context.Context, addr string) (conn drpc.Conn, sc sec.SecureConn, err error) {
tcpConn, err := net.DialTimeout("tcp", addr, time.Second) st := time.Now()
// TODO: move dial timeout to config
tcpConn, err := net.DialTimeout("tcp", addr, time.Second*3)
if err != nil { if err != nil {
return return nil, nil, fmt.Errorf("dialTimeout error: %v; since start: %v", err, time.Since(st))
} }
timeoutConn := timeoutconn.NewConn(tcpConn, time.Millisecond*time.Duration(d.config.Stream.TimeoutMilliseconds)) timeoutConn := timeoutconn.NewConn(tcpConn, time.Millisecond*time.Duration(d.config.Stream.TimeoutMilliseconds))
sc, err = d.transport.TLSConn(ctx, timeoutConn) sc, err = d.transport.TLSConn(ctx, timeoutConn)
if err != nil { if err != nil {
return return nil, nil, fmt.Errorf("tls handshaeke error: %v; since start: %v", err, time.Since(st))
} }
log.Info("connected with remote host", zap.String("serverPeer", sc.RemotePeer().String()), zap.String("addr", addr)) log.Info("connected with remote host", zap.String("serverPeer", sc.RemotePeer().String()), zap.String("addr", addr))
conn = drpcconn.NewWithOptions(sc, drpcconn.Options{Manager: drpcmanager.Options{ conn = drpcconn.NewWithOptions(sc, drpcconn.Options{Manager: drpcmanager.Options{