mirror of
https://github.com/safing/portmaster
synced 2025-04-21 03:19:10 +00:00
* 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>
92 lines
1.9 KiB
Go
92 lines
1.9 KiB
Go
package mgr
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// ExtendedGroup extends the group with additional helpful functionality.
|
|
type ExtendedGroup struct {
|
|
*Group
|
|
|
|
ensureCtx context.Context
|
|
ensureCancel context.CancelFunc
|
|
ensureLock sync.Mutex
|
|
}
|
|
|
|
// NewExtendedGroup returns a new extended group.
|
|
func NewExtendedGroup(modules ...Module) *ExtendedGroup {
|
|
return UpgradeGroup(NewGroup(modules...))
|
|
}
|
|
|
|
// UpgradeGroup upgrades a regular group to an extended group.
|
|
func UpgradeGroup(g *Group) *ExtendedGroup {
|
|
return &ExtendedGroup{
|
|
Group: g,
|
|
ensureCancel: func() {},
|
|
}
|
|
}
|
|
|
|
// EnsureStartedWorker tries to start the group until it succeeds or fails permanently.
|
|
func (eg *ExtendedGroup) EnsureStartedWorker(wCtx *WorkerCtx) error {
|
|
// Setup worker.
|
|
var ctx context.Context
|
|
func() {
|
|
eg.ensureLock.Lock()
|
|
defer eg.ensureLock.Unlock()
|
|
eg.ensureCancel()
|
|
eg.ensureCtx, eg.ensureCancel = context.WithCancel(wCtx.Ctx())
|
|
ctx = eg.ensureCtx
|
|
}()
|
|
|
|
for {
|
|
err := eg.Group.Start()
|
|
switch {
|
|
case err == nil:
|
|
return nil
|
|
case errors.Is(err, ErrInvalidGroupState):
|
|
wCtx.Debug("group start delayed", "err", err)
|
|
default:
|
|
return err
|
|
}
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil
|
|
case <-time.After(1 * time.Second):
|
|
}
|
|
}
|
|
}
|
|
|
|
// EnsureStoppedWorker tries to stop the group until it succeeds or fails permanently.
|
|
func (eg *ExtendedGroup) EnsureStoppedWorker(wCtx *WorkerCtx) error {
|
|
// Setup worker.
|
|
var ctx context.Context
|
|
func() {
|
|
eg.ensureLock.Lock()
|
|
defer eg.ensureLock.Unlock()
|
|
eg.ensureCancel()
|
|
eg.ensureCtx, eg.ensureCancel = context.WithCancel(wCtx.Ctx())
|
|
ctx = eg.ensureCtx
|
|
}()
|
|
|
|
for {
|
|
err := eg.Group.Stop()
|
|
switch {
|
|
case err == nil:
|
|
return nil
|
|
case errors.Is(err, ErrInvalidGroupState):
|
|
wCtx.Debug("group stop delayed", "err", err)
|
|
default:
|
|
return err
|
|
}
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil
|
|
case <-time.After(1 * time.Second):
|
|
}
|
|
}
|
|
}
|