fix: Ensure calls to BoardListWatch gRPC correctly release resources (#…

…2681)
arduino · Jul 31, 2024 · faa6359 · faa6359
1 parent 43598fc
commit faa6359
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/commands/service_board_list.go b/commands/service_board_list.go
@@ -282,20 +282,14 @@ func (s *arduinoCoreServerImpl) BoardListWatch(req *rpc.BoardListWatchRequest, s
 	if err != nil {
 		return err
 	}
-	defer release()
 	dm := pme.DiscoveryManager()
 
 	watcher, err := dm.Watch()
+	release()
 	if err != nil {
 		return err
 	}
 
-	go func() {
-		<-stream.Context().Done()
-		logrus.Trace("closed watch")
-		watcher.Close()
-	}()
-
 	go func() {
 		for event := range watcher.Feed() {
 			port := &rpc.DetectedPort{
@@ -319,5 +313,7 @@ func (s *arduinoCoreServerImpl) BoardListWatch(req *rpc.BoardListWatchRequest, s
 	}()
 
 	<-stream.Context().Done()
+	logrus.Trace("closed watch")
+	watcher.Close()
 	return nil
 }