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

Don't log if context is canceled

Browse source
This commit is contained in:
Eric Lippmann 2021-10-12 12:02:46 +02:00
parent 54dbe0cfbe
commit dc7511cd25
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/icingadb/main.go
View file

@ -211,6 +211,11 @@ func run() int {
g.Go(func() error { g.Go(func() error {
configInitSync.Wait() configInitSync.Wait()
if err := synctx.Err(); err != nil {
return err
}
logger.Info("Starting config runtime updates sync") logger.Info("Starting config runtime updates sync")
return rt.Sync(synctx, v1.ConfigFactories, runtimeConfigUpdateStreams) return rt.Sync(synctx, v1.ConfigFactories, runtimeConfigUpdateStreams)
@ -218,7 +223,13 @@ func run() int {
g.Go(func() error { g.Go(func() error {
stateInitSync.Wait() stateInitSync.Wait()
if err := synctx.Err(); err != nil {
return err
}
logger.Info("Starting state runtime updates sync") logger.Info("Starting state runtime updates sync")
return rt.Sync(synctx, v1.StateFactories, runtimeStateUpdateStreams) return rt.Sync(synctx, v1.StateFactories, runtimeStateUpdateStreams)
}) })

4
pkg/retry/retry.go
View file

@ -48,6 +48,10 @@ func WithBackoff(
return return
} }
if err = parentCtx.Err(); err != nil {
return
}
if settings.OnError != nil { if settings.OnError != nil {
settings.OnError(time.Since(start), attempt, err, prevErr) settings.OnError(time.Since(start), attempt, err, prevErr)
} }