Restructure modules (#1572)
* Move portbase into monorepo * Add new simple module mgr * [WIP] Switch to new simple module mgr * Add StateMgr and more worker variants * [WIP] Switch more modules * [WIP] Switch more modules * [WIP] swtich more modules * [WIP] switch all SPN modules * [WIP] switch all service modules * [WIP] Convert all workers to the new module system * [WIP] add new task system to module manager * [WIP] Add second take for scheduling workers * [WIP] Add FIXME for bugs in new scheduler * [WIP] Add minor improvements to scheduler * [WIP] Add new worker scheduler * [WIP] Fix more bug related to new module system * [WIP] Fix start handing of the new module system * [WIP] Improve startup process * [WIP] Fix minor issues * [WIP] Fix missing subsystem in settings * [WIP] Initialize managers in constructor * [WIP] Move module event initialization to constrictors * [WIP] Fix setting for enabling and disabling the SPN module * [WIP] Move API registeration into module construction * [WIP] Update states mgr for all modules * [WIP] Add CmdLine operation support * Add state helper methods to module group and instance * Add notification and module status handling to status package * Fix starting issues * Remove pilot widget and update security lock to new status data * Remove debug logs * Improve http server shutdown * Add workaround for cleanly shutting down firewall+netquery * Improve logging * Add syncing states with notifications for new module system * Improve starting, stopping, shutdown; resolve FIXMEs/TODOs * [WIP] Fix most unit tests * Review new module system and fix minor issues * Push shutdown and restart events again via API * Set sleep mode via interface * Update example/template module * [WIP] Fix spn/cabin unit test * Remove deprecated UI elements * Make log output more similar for the logging transition phase * Switch spn hub and observer cmds to new module system * Fix log sources * Make worker mgr less error prone * Fix tests and minor issues * Fix observation hub * Improve shutdown and restart handling * Split up big connection.go source file * Move varint and dsd packages to structures repo * Improve expansion test * Fix linter warnings * Fix interception module on windows * Fix linter errors --------- Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
This commit is contained in:
Daniel Hååvi
@@ -1,16 +1,15 @@
|
||||
package captain
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/safing/portbase/database"
|
||||
"github.com/safing/portbase/log"
|
||||
"github.com/safing/portbase/metrics"
|
||||
"github.com/safing/portbase/modules"
|
||||
"github.com/safing/portmaster/base/database"
|
||||
"github.com/safing/portmaster/base/log"
|
||||
"github.com/safing/portmaster/base/metrics"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
"github.com/safing/portmaster/spn/cabin"
|
||||
"github.com/safing/portmaster/spn/conf"
|
||||
"github.com/safing/portmaster/spn/docks"
|
||||
@@ -27,9 +26,6 @@ const (
|
||||
var (
|
||||
publicIdentity *cabin.Identity
|
||||
publicIdentityKey = "core:spn/public/identity"
|
||||
|
||||
publicIdentityUpdateTask *modules.Task
|
||||
statusUpdateTask *modules.Task
|
||||
)
|
||||
|
||||
func loadPublicIdentity() (err error) {
|
||||
@@ -42,7 +38,7 @@ func loadPublicIdentity() (err error) {
|
||||
log.Infof("spn/captain: loaded public hub identity %s", publicIdentity.Hub.ID)
|
||||
case errors.Is(err, database.ErrNotFound):
|
||||
// does not exist, create new
|
||||
publicIdentity, err = cabin.CreateIdentity(module.Ctx, conf.MainMapName)
|
||||
publicIdentity, err = cabin.CreateIdentity(module.mgr.Ctx(), conf.MainMapName)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create new identity: %w", err)
|
||||
}
|
||||
@@ -91,36 +87,22 @@ func loadPublicIdentity() (err error) {
|
||||
}
|
||||
|
||||
func prepPublicIdentityMgmt() error {
|
||||
publicIdentityUpdateTask = module.NewTask(
|
||||
"maintain public identity",
|
||||
maintainPublicIdentity,
|
||||
)
|
||||
module.statusUpdater.Repeat(maintainStatusInterval)
|
||||
|
||||
statusUpdateTask = module.NewTask(
|
||||
"maintain public status",
|
||||
maintainPublicStatus,
|
||||
).Repeat(maintainStatusInterval)
|
||||
|
||||
return module.RegisterEventHook(
|
||||
"config",
|
||||
"config change",
|
||||
"update public identity from config",
|
||||
func(_ context.Context, _ interface{}) error {
|
||||
// trigger update in 5 minutes
|
||||
publicIdentityUpdateTask.Schedule(time.Now().Add(5 * time.Minute))
|
||||
return nil
|
||||
},
|
||||
)
|
||||
module.instance.Config().EventConfigChange.AddCallback("update public identity from config",
|
||||
func(wc *mgr.WorkerCtx, s struct{}) (cancel bool, err error) {
|
||||
module.publicIdentityUpdater.Delay(5 * time.Minute)
|
||||
return false, nil
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
// TriggerHubStatusMaintenance queues the Hub status update task to be executed.
|
||||
func TriggerHubStatusMaintenance() {
|
||||
if statusUpdateTask != nil {
|
||||
statusUpdateTask.Queue()
|
||||
}
|
||||
module.statusUpdater.Go()
|
||||
}
|
||||
|
||||
func maintainPublicIdentity(ctx context.Context, task *modules.Task) error {
|
||||
func maintainPublicIdentity(_ *mgr.WorkerCtx) error {
|
||||
changed, err := publicIdentity.MaintainAnnouncement(nil, false)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to maintain announcement: %w", err)
|
||||
@@ -146,7 +128,7 @@ func maintainPublicIdentity(ctx context.Context, task *modules.Task) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func maintainPublicStatus(ctx context.Context, task *modules.Task) error {
|
||||
func maintainPublicStatus(ctx *mgr.WorkerCtx) error {
|
||||
// Get current lanes.
|
||||
cranes := docks.GetAllAssignedCranes()
|
||||
lanes := make([]*hub.Lane, 0, len(cranes))
|
||||
|
||||
Reference in New Issue
Block a user