From 44eb3241014229089490bcb51792692ad4deb7cc Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 7 Apr 2020 17:02:23 +0700
Subject: [PATCH] don't export the qlog file when receiving a Version
 Negotiation packet

---
 session.go      | 10 +++++-----
 session_test.go |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/session.go b/session.go
index b30ca0ea3..67019268b 100644
--- a/session.go
+++ b/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
 }
 
diff --git a/session_test.go b/session_test.go
index 22f143675..7b18db345 100644
--- a/session_test.go
+++ b/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