Merge pull request #2472 from lucas-clemente/dont-export-qlog-on-version-negotiation

don't trigger the qlog export when receiving a Version Negotiation packet

session.go

@@ -600,14 +600,14 @@ runLoop:
 	}
 
 	s.handleCloseError(closeErr)
+	if closeErr.err != errCloseForRecreating && s.qlogger != nil {
+		if err := s.qlogger.Export(); err != nil {
+			s.logger.Errorf("exporting qlog failed: %s", err)
+		}
+	}
 	s.logger.Infof("Connection %s closed.", s.logID)
 	s.cryptoStreamHandler.Close()
 	s.sendQueue.Close()
-	if s.qlogger != nil {
-		if err := s.qlogger.Export(); err != nil {
-			return err
-		}
-	}
 	return closeErr.err
 }
 

session_test.go

@@ -480,7 +480,7 @@ var _ = Describe("Session", func() {
 			sessionRunner.EXPECT().Remove(gomock.Any()).AnyTimes()
 			cryptoSetup.EXPECT().Close()
 			// don't EXPECT any calls to mconn.Write()
-			qlogger.EXPECT().Export()
+			// don't EXPECT any call to qlogger.Export()
 			sess.closeForRecreating()
 			Eventually(areSessionsRunning).Should(BeFalse())
 			expectedRunErr = errCloseForRecreating