grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

channelz: register sockets with meaningful refnames (#2416)

This commit is contained in:
Menghan Li 2018-10-30 16:28:48 -07:00 committed by GitHub
parent ec76f14f6f
commit c4d3b2fa07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/transport/http2_client.go
View File

@ -19,6 +19,7 @@
package transport package transport
import ( import (
"fmt"
"io" "io"
"math" "math"
"net" "net"
@ -265,7 +266,7 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne
t.statsHandler.HandleConn(t.ctx, connBegin) t.statsHandler.HandleConn(t.ctx, connBegin)
} }
if channelz.IsOn() { if channelz.IsOn() {
t.channelzID = channelz.RegisterNormalSocket(t, opts.ChannelzParentID, "") t.channelzID = channelz.RegisterNormalSocket(t, opts.ChannelzParentID, fmt.Sprintf("%s -> %s", t.localAddr, t.remoteAddr))
} }
if t.kp.Time != infinity { if t.kp.Time != infinity {
t.keepaliveEnabled = true t.keepaliveEnabled = true

2
internal/transport/http2_server.go
View File

@ -237,7 +237,7 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
t.stats.HandleConn(t.ctx, connBegin) t.stats.HandleConn(t.ctx, connBegin)
} }
if channelz.IsOn() { if channelz.IsOn() {
t.channelzID = channelz.RegisterNormalSocket(t, config.ChannelzParentID, "") t.channelzID = channelz.RegisterNormalSocket(t, config.ChannelzParentID, fmt.Sprintf("%s -> %s", t.remoteAddr, t.localAddr))
} }
t.framer.writer.Flush() t.framer.writer.Flush()

2
server.go
View File

@ -535,7 +535,7 @@ func (s *Server) Serve(lis net.Listener) error {
s.lis[ls] = true s.lis[ls] = true
if channelz.IsOn() { if channelz.IsOn() {
ls.channelzID = channelz.RegisterListenSocket(ls, s.channelzID, "") ls.channelzID = channelz.RegisterListenSocket(ls, s.channelzID, lis.Addr().String())
} }
s.mu.Unlock() s.mu.Unlock()