X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c2cba51503a0e41ddd68083993e32fe085e49a7f..4ed6415ef859ccca13a46c77046f9febfb05bb2b:/services/ws/handler.go

diff --git a/services/ws/handler.go b/services/ws/handler.go
index 912643ad97..8b6e9b9772 100644
--- a/services/ws/handler.go
+++ b/services/ws/handler.go
@@ -38,9 +38,6 @@ func (h *handler) Handle(ws wsConn, logger logrus.FieldLogger, eventSource event
 	ctx, cancel := context.WithCancel(ws.Request().Context())
 	defer cancel()
 
-	incoming := eventSource.NewSink()
-	defer incoming.Stop()
-
 	queue := make(chan interface{}, h.QueueSize)
 	h.mtx.Lock()
 	h.lastDelay[queue] = 0
@@ -163,6 +160,9 @@ func (h *handler) Handle(ws wsConn, logger logrus.FieldLogger, eventSource event
 		ticker := time.NewTicker(h.PingTimeout)
 		defer ticker.Stop()
 
+		incoming := eventSource.NewSink()
+		defer incoming.Stop()
+
 		for {
 			select {
 			case <-ctx.Done():