From f0437139f3faeea169ffff1e16df2fe767fc5cd0 Mon Sep 17 00:00:00 2001 From: XingfenD Date: Mon, 14 Sep 2026 19:36:57 +0800 Subject: [PATCH] fix(main): channel-based serve error instead of log.Fatalf in goroutine (B14) --- backend/cmd/webui/main.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/cmd/webui/main.go b/backend/cmd/webui/main.go index f487e59..2a01e5e 100644 --- a/backend/cmd/webui/main.go +++ b/backend/cmd/webui/main.go @@ -42,15 +42,25 @@ func main() { sc := scanner.New(st, cfg, rdb) go sc.Run(ctx) + serveErr := make(chan error, 1) srv := &http.Server{Addr: cfg.Addr, Handler: api.NewRouter(cfg, st, rdb, sc), ReadHeaderTimeout: 10 * time.Second} go func() { log.Printf("listening on %s", cfg.Addr) if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { - log.Fatalf("serve: %v", err) + serveErr <- err } + close(serveErr) }() - <-ctx.Done() + + // Wait for signal OR serve error. + select { + case <-ctx.Done(): + case err := <-serveErr: + if err != nil { + log.Printf("serve: %v", err) + } + } // stop() 先取消 ctx → scanner 循环退出;再等 HTTP 收尾。 // 在途 ScanLibraryByID(WithoutCancel)不受 ctx 控制,靠 redis 锁 TTL 兜底(已文档化的上限)。 stop()