X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eb66b34d22cef6c98ad9ebdc228cf784b3136b72..74e03b2190fea52b3ea5800c50eca55b6e50b220:/services/ws/session_v0.go

diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index 58c64231cb..4fbfc489cf 100644
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -205,6 +205,10 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
 			// client will probably reconnect and do the
 			// same thing all over again.
 			time.Sleep(100 * time.Millisecond)
+			if sess.ws.Request().Context().Err() != nil {
+				// Session terminated while we were sleeping
+				return
+			}
 		}
 		now := time.Now()
 		e := &event{