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

Merge pull request #70 from safing/fix/failing-worker-shutdown

Browse source 
Fix shutdown of failing service workers
This commit is contained in:
Patrick Pacher 2020-08-12 13:44:01 +02:00 • committed by GitHub
commit c479430d46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/worker.go
View file

@ -90,7 +90,11 @@ func (m *Module) runServiceWorker(name string, backoffDuration time.Duration, fn
// log error // log error
sleepFor := time.Duration(failCnt) * backoffDuration sleepFor := time.Duration(failCnt) * backoffDuration
log.Errorf("%s: service-worker %s failed (%d): %s - restarting in %s", m.Name, name, failCnt, err, sleepFor) log.Errorf("%s: service-worker %s failed (%d): %s - restarting in %s", m.Name, name, failCnt, err, sleepFor)
time.Sleep(sleepFor) select {
case <-time.After(sleepFor):
case <-m.Ctx.Done():
return
}
// loop to restart // loop to restart
} else { } else {
log.Infof("%s: service-worker %s %s - restarting now", m.Name, name, err) log.Infof("%s: service-worker %s %s - restarting now", m.Name, name, err)

2
updater/resource.go
View file

@ -227,7 +227,7 @@ func (res *Resource) selectVersion() {
// export after we finish // export after we finish
defer func() { defer func() {
log.Debugf("updater: selected version %s for resource %s", res.SelectedVersion, res.Identifier) log.Tracef("updater: selected version %s for resource %s", res.SelectedVersion, res.Identifier)
if res.inUse() && if res.inUse() &&
res.SelectedVersion != res.ActiveVersion && // new selected version does not match previously selected version res.SelectedVersion != res.ActiveVersion && // new selected version does not match previously selected version