From 8118beab67b9e029c428f634e847892c1e800a9d Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 7 Mar 2019 14:01:41 +0900 Subject: [PATCH] remove the error return value from session.handleCloseError --- session.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/session.go b/session.go index a69d06ff8..092acaf8a 100644 --- a/session.go +++ b/session.go @@ -423,9 +423,7 @@ runLoop: } } - if err := s.handleCloseError(closeErr); err != nil { - s.logger.Infof("Handling close error failed: %s", err) - } + s.handleCloseError(closeErr) s.closed.Set(true) s.logger.Infof("Connection %s closed.", s.srcConnID) s.cryptoStreamHandler.Close() @@ -866,7 +864,7 @@ func (s *session) CloseWithError(code protocol.ApplicationErrorCode, e error) er return nil } -func (s *session) handleCloseError(closeErr closeError) error { +func (s *session) handleCloseError(closeErr closeError) { if closeErr.err == nil { closeErr.err = qerr.NoError } @@ -886,15 +884,15 @@ func (s *session) handleCloseError(closeErr closeError) error { s.streamsMap.CloseWithError(quicErr) if !closeErr.sendClose { - return nil + return } - // If this is a remote close we're done here if closeErr.remote { - return nil + return + } + if err := s.sendConnectionClose(quicErr); err != nil { + s.logger.Debugf("Error sending CONNECTION_CLOSE: %s", err) } - // otherwise send a CONNECTION_CLOSE - return s.sendConnectionClose(quicErr) } func (s *session) processTransportParameters(data []byte) {