fix(main): channel-based serve error instead of log.Fatalf in goroutine (B14)
This commit is contained in:
@@ -42,15 +42,25 @@ func main() {
|
|||||||
sc := scanner.New(st, cfg, rdb)
|
sc := scanner.New(st, cfg, rdb)
|
||||||
go sc.Run(ctx)
|
go sc.Run(ctx)
|
||||||
|
|
||||||
|
serveErr := make(chan error, 1)
|
||||||
srv := &http.Server{Addr: cfg.Addr, Handler: api.NewRouter(cfg, st, rdb, sc),
|
srv := &http.Server{Addr: cfg.Addr, Handler: api.NewRouter(cfg, st, rdb, sc),
|
||||||
ReadHeaderTimeout: 10 * time.Second}
|
ReadHeaderTimeout: 10 * time.Second}
|
||||||
go func() {
|
go func() {
|
||||||
log.Printf("listening on %s", cfg.Addr)
|
log.Printf("listening on %s", cfg.Addr)
|
||||||
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
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 收尾。
|
// stop() 先取消 ctx → scanner 循环退出;再等 HTTP 收尾。
|
||||||
// 在途 ScanLibraryByID(WithoutCancel)不受 ctx 控制,靠 redis 锁 TTL 兜底(已文档化的上限)。
|
// 在途 ScanLibraryByID(WithoutCancel)不受 ctx 控制,靠 redis 锁 TTL 兜底(已文档化的上限)。
|
||||||
stop()
|
stop()
|
||||||
|
|||||||
Reference in New Issue
Block a user