github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7617 from mxpv/ctr-fix

Browse Source 
Fix ctr crash when pulling with --http-dump and --http-trace simultaneously
This commit is contained in:
Kazuyoshi Kato
2022-11-02 07:58:18 -07:00
committed by GitHub
parent 58587d3a8a 9c2a634408
commit 8c5baf4ebb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ctr/commands/resolver.go
View File

@@ -200,7 +200,12 @@ func NewDebugClientTrace(ctx gocontext.Context) *httptrace.ClientTrace {
}
},
GotConn: func(connInfo httptrace.GotConnInfo) {
log.G(ctx).WithField("reused", connInfo.Reused).WithField("remote_addr", connInfo.Conn.RemoteAddr().String()).Debugf("Connection successful")
remoteAddr := "<nil>"
if addr := connInfo.Conn.RemoteAddr(); addr != nil {
remoteAddr = addr.String()
}
log.G(ctx).WithField("reused", connInfo.Reused).WithField("remote_addr", remoteAddr).Debugf("Connection successful")
},
}
}