[blockdao] Fix program unstopable when blockdao is checking indexer (#…

…4217)
iotexproject · Apr 7, 2024 · 3b9e91f · 3b9e91f
1 parent 40ee548
commit 3b9e91f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/blockchain/blockdao/blockindexer.go b/blockchain/blockdao/blockindexer.go
@@ -82,6 +82,10 @@ func (bic *BlockIndexerChecker) CheckIndexer(ctx context.Context, indexer BlockI
 		}
 	}
 	for i := startHeight; i <= targetHeight; i++ {
+		// ternimate if context is done
+		if err := ctx.Err(); err != nil {
+			return errors.Wrap(err, "terminate the indexer checking")
+		}
 		blk, err := bic.dao.GetBlockByHeight(i)
 		if err != nil {
 			return err

diff --git a/server/itx/server.go b/server/itx/server.go
@@ -113,7 +113,7 @@ func newServer(cfg config.Config, testing bool) (*Server, error) {
 
 // Start starts the server
 func (s *Server) Start(ctx context.Context) error {
-	cctx, cancel := context.WithCancel(context.Background())
+	cctx, cancel := context.WithCancel(ctx)
 	s.subModuleCancel = cancel
 	for id, cs := range s.chainservices {
 		if err := cs.Start(cctx); err != nil {