gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1896 from lucas-clemente/block-destroy-until-run-finished

Browse Source 
wait until the run loop has finished when calling session.destroy()
This commit is contained in:
Marten Seemann
2019-05-12 23:19:39 +08:00
committed by GitHub
parent 369b9bc6d5 eee3af0757
commit 6cdc228ef6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
session.go
View File

@@ -415,11 +415,11 @@ runLoop:
}
if !s.handshakeComplete && now.Sub(s.sessionCreationTime) >= s.config.HandshakeTimeout {
s.destroy(qerr.TimeoutError("Handshake did not complete in time"))
s.destroyImpl(qerr.TimeoutError("Handshake did not complete in time"))
continue
}
if s.handshakeComplete && now.Sub(s.idleTimeoutStartTime()) >= s.config.IdleTimeout {
s.destroy(qerr.TimeoutError("No recent network activity"))
s.destroyImpl(qerr.TimeoutError("No recent network activity"))
continue
}
@@ -851,6 +851,11 @@ func (s *session) closeLocal(e error) {
// destroy closes the session without sending the error on the wire
func (s *session) destroy(e error) {
s.destroyImpl(e)
<-s.ctx.Done()
}
func (s *session) destroyImpl(e error) {
s.closeOnce.Do(func() {
if nerr, ok := e.(net.Error); ok && nerr.Timeout() {
s.logger.Errorf("Destroying session %s: %s", s.destConnID, e)