polish(ctx): setup ctx cancel in main

- dedups cancel logic

Author: frrist

commands/walk.go

@@ -3,10 +3,7 @@ package commands
 import (
 	"context"
 	"errors"
-	"os"
-	"os/signal"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/filecoin-project/sentinel-visor/schedule"
@@ -100,20 +97,6 @@ func walk(cctx *cli.Context) error {
 			strg = db
 		}
 	}
-	// Set up a context that is canceled when the command is interrupted
-	ctx, cancel := context.WithCancel(cctx.Context)
-	defer cancel()
-
-	// Set up a signal handler to cancel the context
-	go func() {
-		interrupt := make(chan os.Signal, 1)
-		signal.Notify(interrupt, syscall.SIGTERM, syscall.SIGINT)
-		select {
-		case <-interrupt:
-			cancel()
-		case <-ctx.Done():
-		}
-	}()
 
 	scheduler := schedule.NewScheduler(cctx.Duration("task-delay"))
 
@@ -136,7 +119,7 @@ func walk(cctx *cli.Context) error {
 	})
 
 	// Start the scheduler and wait for it to complete or to be cancelled.
-	err = scheduler.Run(ctx)
+	err = scheduler.Run(cctx.Context)
 	if !errors.Is(err, context.Canceled) {
 		return err
 	}

commands/watch.go

@@ -3,10 +3,7 @@ package commands
 import (
 	"context"
 	"errors"
-	"os"
-	"os/signal"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/filecoin-project/sentinel-visor/schedule"
@@ -75,21 +72,6 @@ func watch(cctx *cli.Context) error {
 		storage = db
 	}
 
-	// Set up a context that is canceled when the command is interrupted
-	ctx, cancel := context.WithCancel(cctx.Context)
-	defer cancel()
-
-	// Set up a signal handler to cancel the context
-	go func() {
-		interrupt := make(chan os.Signal, 1)
-		signal.Notify(interrupt, syscall.SIGTERM, syscall.SIGINT)
-		select {
-		case <-interrupt:
-			cancel()
-		case <-ctx.Done():
-		}
-	}()
-
 	tsIndexer, err := chain.NewTipSetIndexer(lensOpener, storage, builtin.EpochDurationSeconds*time.Second, cctx.String("name"), tasks)
 	if err != nil {
 		return xerrors.Errorf("setup indexer: %w", err)
@@ -107,7 +89,7 @@ func watch(cctx *cli.Context) error {
 	})
 
 	// Start the scheduler and wait for it to complete or to be cancelled.
-	err = scheduler.Run(ctx)
+	err = scheduler.Run(cctx.Context)
 	if !errors.Is(err, context.Canceled) {
 		return err
 	}

main.go

@@ -1,8 +1,11 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"os"
+	"os/signal"
+	"syscall"
 
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/urfave/cli/v2"
@@ -14,6 +17,21 @@ import (
 var log = logging.Logger("visor")
 
 func main() {
+	// Set up a context that is canceled when the command is interrupted
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// Set up a signal handler to cancel the context
+	go func() {
+		interrupt := make(chan os.Signal, 1)
+		signal.Notify(interrupt, syscall.SIGTERM, syscall.SIGINT)
+		select {
+		case <-interrupt:
+			cancel()
+		case <-ctx.Done():
+		}
+	}()
+
 	if err := logging.SetLogLevel("*", "info"); err != nil {
 		log.Fatal(err)
 	}
@@ -137,7 +155,7 @@ func main() {
 		},
 	}
 
-	if err := app.Run(os.Args); err != nil {
+	if err := app.RunContext(ctx, os.Args); err != nil {
 		log.Fatal(err)
 	}
 }