vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-04-17 16:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop logging an error for canceled tasks and workers

Browse source
This commit is contained in:
Daniel 2022-08-12 13:27:33 +02:00
parent 866cd484c4
commit 47f071ac9b
2 changed files with 19 additions and 4 deletions

8
modules/tasks.go
View file

@ -3,6 +3,7 @@ package modules
import (
"container/list"
"context"
"errors"
"fmt"
"sync"
"sync/atomic"
@ -382,7 +383,12 @@ func (t *Task) executeWithLocking() {
// run
err := t.taskFn(t.ctx, t)
if err != nil {
switch {
case err == nil:
return
case errors.Is(err, context.Canceled):
log.Debugf("%s: task %s was canceled: %s", t.module.Name, t.name, err)
default:
log.Errorf("%s: task %s failed: %s", t.module.Name, t.name, err)
}
}

15
modules/worker.go
View file

@ -25,8 +25,13 @@ var (
func (m *Module) StartWorker(name string, fn func(context.Context) error) {
go func() {
err := m.RunWorker(name, fn)
if err != nil {
log.Warningf("%s: worker %s failed: %s", m.Name, name, err)
switch {
case err == nil:
return
case errors.Is(err, context.Canceled):
log.Debugf("%s: worker %s was canceled: %s", m.Name, name, err)
default:
log.Errorf("%s: worker %s failed: %s", m.Name, name, err)
}
}()
}
@ -87,7 +92,11 @@ func (m *Module) runServiceWorker(name string, backoffDuration time.Duration, fn
lastFail = time.Now()
// log error
sleepFor := time.Duration(failCnt) * backoffDuration
log.Errorf("%s: service-worker %s failed (%d): %s - restarting in %s", m.Name, name, failCnt, err, sleepFor)
if errors.Is(err, context.Canceled) {
log.Debugf("%s: service-worker %s was canceled (%d): %s - restarting in %s", m.Name, name, failCnt, err, sleepFor)
} else {
log.Errorf("%s: service-worker %s failed (%d): %s - restarting in %s", m.Name, name, failCnt, err, sleepFor)
}
select {
case <-time.After(sleepFor):
case <-m.Ctx.Done():