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:
@@ -6,8 +6,8 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/safing/portbase/modules"
|
||||
"github.com/safing/portmaster/service/intel/filterlists"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
"github.com/safing/portmaster/service/profile/endpoints"
|
||||
)
|
||||
|
||||
@@ -24,19 +24,16 @@ var (
|
||||
)
|
||||
|
||||
func registerConfigUpdater() error {
|
||||
return module.RegisterEventHook(
|
||||
"config",
|
||||
"config change",
|
||||
"update global config profile",
|
||||
func(ctx context.Context, _ interface{}) error {
|
||||
return updateGlobalConfigProfile(ctx, nil)
|
||||
},
|
||||
)
|
||||
module.instance.Config().EventConfigChange.AddCallback("update global config profile", func(wc *mgr.WorkerCtx, s struct{}) (cancel bool, err error) {
|
||||
return false, updateGlobalConfigProfile(wc.Ctx())
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
const globalConfigProfileErrorID = "profile:global-profile-error"
|
||||
|
||||
func updateGlobalConfigProfile(ctx context.Context, task *modules.Task) error {
|
||||
func updateGlobalConfigProfile(_ context.Context) error {
|
||||
cfgLock.Lock()
|
||||
defer cfgLock.Unlock()
|
||||
|
||||
@@ -132,25 +129,23 @@ func updateGlobalConfigProfile(ctx context.Context, task *modules.Task) error {
|
||||
|
||||
// If there was any error, try again later until it succeeds.
|
||||
if lastErr == nil {
|
||||
module.Resolve(globalConfigProfileErrorID)
|
||||
module.states.Remove(globalConfigProfileErrorID)
|
||||
} else {
|
||||
// Create task after first failure.
|
||||
if task == nil {
|
||||
task = module.NewTask(
|
||||
"retry updating global config profile",
|
||||
updateGlobalConfigProfile,
|
||||
)
|
||||
}
|
||||
|
||||
// Schedule task.
|
||||
task.Schedule(time.Now().Add(15 * time.Second))
|
||||
_ = module.mgr.Delay("retry updating global config profile", 15*time.Second,
|
||||
func(w *mgr.WorkerCtx) error {
|
||||
return updateGlobalConfigProfile(w.Ctx())
|
||||
})
|
||||
|
||||
// Add module warning to inform user.
|
||||
module.Warning(
|
||||
globalConfigProfileErrorID,
|
||||
"Internal Settings Failure",
|
||||
fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", err),
|
||||
)
|
||||
module.states.Add(mgr.State{
|
||||
ID: globalConfigProfileErrorID,
|
||||
Name: "Internal Settings Failure",
|
||||
Message: fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", err),
|
||||
Type: mgr.StateTypeWarning,
|
||||
})
|
||||
}
|
||||
|
||||
return lastErr
|
||||
|
||||
Reference in New Issue
Block a user