refactor(canal): error handling on startup

Author: trim21

canal/canal.go

@@ -18,11 +18,15 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/trim21/errgo"
 	"go.uber.org/fx"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/bangumi/server/config"
 	"github.com/bangumi/server/dal"
@@ -82,23 +86,33 @@ func Main() error {
 		return errgo.Wrap(err, "fx")
 	}
 
-	var errChan = make(chan error, 1)
-
 	// metrics http reporter
 	mux := http.NewServeMux()
 	mux.Handle("/metrics", promhttp.Handler())
 	srv := &http.Server{Addr: h.config.ListenAddr(), Handler: mux, ReadHeaderTimeout: time.Second}
-	go func() { errChan <- errgo.Wrap(srv.ListenAndServe(), "http") }()
+
+	var wg errgroup.Group
+
 	defer srv.Shutdown(context.Background()) //nolint:errcheck
+	wg.Go(func() error {
+		return errgo.Wrap(srv.ListenAndServe(), "http")
+	})
 
-	go func() { errChan <- errgo.Wrap(h.start(), "start") }()
 	defer h.Close()
-
-	select {
-	case err := <-errChan:
-		return err
-	case <-sys.HandleSignal():
-		logger.Info("receive signal, shutdown")
-		return nil
-	}
+	wg.Go(func() error {
+		return errgo.Wrap(h.start(), "start")
+	})
+
+	wg.Go(func() error {
+		sigChan := make(chan os.Signal, 1)
+		signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
+
+		select {
+		case <-sys.HandleSignal():
+			logger.Info("receive signal, shutdown")
+			return fmt.Errorf("receive signal")
+		}
+	})
+
+	wg.Wait()
 }

go.mod

@@ -38,6 +38,7 @@ require (
 	github.com/trim21/pkg v0.0.4
 	go.uber.org/fx v1.23.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/sync v0.12.0
 	golang.org/x/text v0.23.0
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/mysql v1.5.7
@@ -114,7 +115,6 @@ require (
 	golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/net v0.36.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
 	golang.org/x/time v0.8.0 // indirect