fix: Use lock and queue.CloseAndDiscard for watchers

ProtonMail · Oct 21, 2022 · 0b277a6 · 0b277a6
1 parent 82064e3
commit 0b277a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -249,10 +249,15 @@ func (s *Server) Close(ctx context.Context) error {
 	s.serveErrCh.Close()
 
 	// Close any watchers.
+	s.watchersLock.Lock()
+	defer s.watchersLock.Unlock()
+
 	for _, watcher := range s.watchers {
 		watcher.Close()
 	}
 
+	s.watchers = nil
+
 	return nil
 }
 

diff --git a/watcher/watcher.go b/watcher/watcher.go
@@ -43,5 +43,5 @@ func (w *Watcher[T]) Send(event T) bool {
 }
 
 func (w *Watcher[T]) Close() {
-	w.eventCh.Close()
+	w.eventCh.CloseAndDiscardQueued()
 }