Transition dbmodule package to new module task system

This commit is contained in:
Daniel 2019-09-20 22:01:02 +02:00
parent 3236ddf87f
commit ac6d9db456
2 changed files with 25 additions and 33 deletions

View file

@ -38,7 +38,7 @@ func start() error {
return err return err
} }
startMaintainer() registerMaintenanceTasks()
return nil return nil
} }

View file

@ -1,45 +1,37 @@
package dbmodule package dbmodule
import ( import (
"context"
"time" "time"
"github.com/safing/portbase/database" "github.com/safing/portbase/database"
"github.com/safing/portbase/log" "github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
) )
var ( func registerMaintenanceTasks() {
maintenanceShortTickDuration = 10 * time.Minute module.NewTask("basic maintenance", maintainBasic).Repeat(10 * time.Minute).MaxDelay(10 * time.Minute)
maintenanceLongTickDuration = 1 * time.Hour module.NewTask("thorough maintenance", maintainThorough).Repeat(1 * time.Hour).MaxDelay(1 * time.Hour)
) module.NewTask("record maintenance", maintainRecords).Repeat(1 * time.Hour).MaxDelay(1 * time.Hour)
func startMaintainer() {
module.AddWorkers(1)
go maintenanceWorker()
} }
func maintenanceWorker() { func maintainBasic(ctx context.Context, task *modules.Task) {
ticker := time.NewTicker(maintenanceShortTickDuration) err := database.Maintain()
longTicker := time.NewTicker(maintenanceLongTickDuration) if err != nil {
log.Errorf("database: maintenance error: %s", err)
for { }
select { }
case <-ticker.C:
err := database.Maintain() func maintainThorough(ctx context.Context, task *modules.Task) {
if err != nil { err := database.MaintainThorough()
log.Errorf("database: maintenance error: %s", err) if err != nil {
} log.Errorf("database: thorough maintenance error: %s", err)
case <-longTicker.C: }
err := database.MaintainRecordStates() }
if err != nil {
log.Errorf("database: record states maintenance error: %s", err) func maintainRecords(ctx context.Context, task *modules.Task) {
} err := database.MaintainRecordStates()
err = database.MaintainThorough() if err != nil {
if err != nil { log.Errorf("database: record states maintenance error: %s", err)
log.Errorf("database: thorough maintenance error: %s", err)
}
case <-module.ShuttingDown():
module.FinishWorker()
return
}
} }
} }