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:
@@ -9,8 +9,8 @@ import (
|
||||
|
||||
"github.com/tevino/abool"
|
||||
|
||||
"github.com/safing/portbase/log"
|
||||
"github.com/safing/portbase/modules"
|
||||
"github.com/safing/portmaster/base/log"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
"github.com/safing/portmaster/spn/conf"
|
||||
)
|
||||
|
||||
@@ -22,9 +22,9 @@ func HTTPSConnectivityConfirmed() bool {
|
||||
return httpsConnectivityConfirmed.IsSet()
|
||||
}
|
||||
|
||||
func connectivityCheckTask(ctx context.Context, task *modules.Task) error {
|
||||
func connectivityCheckTask(wc *mgr.WorkerCtx) error {
|
||||
// Start tracing logs.
|
||||
ctx, tracer := log.AddTracer(ctx)
|
||||
ctx, tracer := log.AddTracer(wc.Ctx())
|
||||
defer tracer.Submit()
|
||||
|
||||
// Run checks and report status.
|
||||
@@ -32,14 +32,14 @@ func connectivityCheckTask(ctx context.Context, task *modules.Task) error {
|
||||
if success {
|
||||
tracer.Info("spn/patrol: all connectivity checks succeeded")
|
||||
if httpsConnectivityConfirmed.SetToIf(false, true) {
|
||||
module.TriggerEvent(ChangeSignalEventName, nil)
|
||||
module.EventChangeSignal.Submit(struct{}{})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
tracer.Errorf("spn/patrol: connectivity check failed")
|
||||
if httpsConnectivityConfirmed.SetToIf(true, false) {
|
||||
module.TriggerEvent(ChangeSignalEventName, nil)
|
||||
module.EventChangeSignal.Submit(struct{}{})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func checkHTTPSConnectivity(ctx context.Context, network string, checks int, req
|
||||
|
||||
// Run tests.
|
||||
var succeeded int
|
||||
for i := 0; i < checks; i++ {
|
||||
for range checks {
|
||||
if checkHTTPSConnection(ctx, network) {
|
||||
succeeded++
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user