From ce0db8344b1d12ae7b5680fa95bdbdb88612fa9e Mon Sep 17 00:00:00 2001 From: Ian Kerins Date: Wed, 30 Mar 2022 10:04:17 -0400 Subject: [PATCH] Fix signaler not exiting on cancel (#1638) * fix: make signaler exit on cancel `break` is incorrect here, as it just breaks out of the select. `return` to exit the function instead. Fixes #1636. Signed-off-by: Ian Kerins * fix: exit non-zero on fatal error Signed-off-by: Ian Kerins --- cmd/root.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index dcb75ca60..ea8aea661 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -69,6 +69,7 @@ func runNavidrome() { if err := g.Run(); err != nil { log.Error("Fatal error in Navidrome. Aborting", err) + os.Exit(1) } } @@ -111,7 +112,7 @@ func startSignaler() (func() error, func(err error)) { } log.Info(ctx, "Triggered scan complete", "elapsed", time.Since(start).Round(100*time.Millisecond)) case <-ctx.Done(): - break + return nil } } }, func(err error) {