From 8e1053a1166fa64eb3690b1423df5bfe0d7896d8 Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Sun, 15 Jan 2023 22:44:09 +0300 Subject: [PATCH] addr in dial logs --- net/dialer/dialer.go | 2 +- net/rpc/server/baseserver.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/dialer/dialer.go b/net/dialer/dialer.go index a789efdb..a5dfd0a0 100644 --- a/net/dialer/dialer.go +++ b/net/dialer/dialer.go @@ -98,7 +98,7 @@ func (d *dialer) handshake(ctx context.Context, addr string) (conn drpc.Conn, sc if err != nil { return } - log.Info("connected with remote host", zap.String("serverPeer", sc.RemotePeer().String()), zap.String("per", sc.LocalPeer().String())) + 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{ Reader: drpcwire.ReaderOptions{MaximumBufferSize: d.config.Stream.MaxMsgSizeMb * (1 << 20)}, }}) diff --git a/net/rpc/server/baseserver.go b/net/rpc/server/baseserver.go index 1a38248f..e7282904 100644 --- a/net/rpc/server/baseserver.go +++ b/net/rpc/server/baseserver.go @@ -70,9 +70,8 @@ func (s *BaseDrpcServer) serve(ctx context.Context, lis secureservice.ContextLis if err != nil { if isTemporary(err) { l.Debug("listener temporary accept error", zap.Error(err)) - t := time.NewTimer(500 * time.Millisecond) select { - case <-t.C: + case <-time.After(time.Second): case <-ctx.Done(): return }