upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-06-09 08:56:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

main(): don't panic on (intentional) context cancel

Browse source
This commit is contained in:
Alexander A. Klimov 2021-03-26 12:15:40 +01:00
parent 40cef17db1
commit 5e473e8b37
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/icingadb/main.go
View file

@ -9,6 +9,7 @@ import (
"github.com/icinga/icingadb/pkg/icingadb/history"
v1 "github.com/icinga/icingadb/pkg/icingadb/v1"
"github.com/icinga/icingadb/pkg/icingaredis"
"github.com/icinga/icingadb/pkg/utils"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"
)
@ -118,9 +119,7 @@ func main() {
return hs.Sync(synctx)
})
if err := g.Wait(); err != nil {
// TODO(el): This panics here even if a ctx gets cancelled.
// That is intentional for the moment for testing.
if err := g.Wait(); err != nil && !utils.IsContextCanceled(err) {
panic(err)
}
@ -130,7 +129,7 @@ func main() {
case <-ha.Handover():
cancel()
case <-ctx.Done():
if err := ctx.Err(); err != nil {
if err := ctx.Err(); err != nil && !utils.IsContextCanceled(err) {
panic(err)
}
case <-done: