Downloader main loop wait on close (erigontech#7082)

sentioxyz · Mar 16, 2023 · 956e972 · 956e972
1 parent c676aa8
commit 956e972
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/downloader/main.go b/cmd/downloader/main.go
@@ -162,7 +162,7 @@ func Downloader(ctx context.Context) error {
 	}
 	defer d.Close()
 	log.Info("[torrent] Start", "my peerID", fmt.Sprintf("%x", d.Torrent().PeerID()))
-	go downloader.MainLoop(ctx, d, false)
+	d.MainLoopInBackground(ctx, false)
 
 	bittorrentServer, err := downloader.NewGrpcServer(d)
 	if err != nil {

diff --git a/cmd/erigon-el/backend/backend.go b/cmd/erigon-el/backend/backend.go
@@ -882,7 +882,7 @@ func (s *Ethereum) setUpBlockReader(ctx context.Context, dirs datadir.Dirs, snCo
 			if err != nil {
 				return nil, nil, nil, err
 			}
-			go downloader3.MainLoop(ctx, s.downloader, true)
+			s.downloader.MainLoopInBackground(ctx, true)
 			bittorrentServer, err := downloader3.NewGrpcServer(s.downloader)
 			if err != nil {
 				return nil, nil, nil, fmt.Errorf("new server: %w", err)

diff --git a/eth/backend.go b/eth/backend.go
@@ -994,7 +994,7 @@ func (s *Ethereum) setUpBlockReader(ctx context.Context, dirs datadir.Dirs, snCo
 			if err != nil {
 				return nil, nil, nil, err
 			}
-			go downloader3.MainLoop(ctx, s.downloader, true)
+			s.downloader.MainLoopInBackground(ctx, true)
 			bittorrentServer, err := downloader3.NewGrpcServer(s.downloader)
 			if err != nil {
 				return nil, nil, nil, fmt.Errorf("new server: %w", err)