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:
@@ -5,8 +5,9 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/safing/portbase/log"
|
||||
"github.com/safing/portmaster/base/log"
|
||||
"github.com/safing/portmaster/service/intel"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
"github.com/safing/portmaster/service/network/netutils"
|
||||
"github.com/safing/portmaster/service/profile/endpoints"
|
||||
"github.com/safing/portmaster/spn/docks"
|
||||
@@ -45,7 +46,7 @@ func startPiers() error {
|
||||
}
|
||||
|
||||
// Start worker to handle docking requests.
|
||||
module.StartServiceWorker("docking request handler", 0, dockingRequestHandler)
|
||||
module.mgr.Go("docking request handler", dockingRequestHandler)
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -56,7 +57,7 @@ func stopPiers() {
|
||||
}
|
||||
}
|
||||
|
||||
func dockingRequestHandler(ctx context.Context) error {
|
||||
func dockingRequestHandler(wc *mgr.WorkerCtx) error {
|
||||
// Sink all waiting ships when this worker ends.
|
||||
// But don't be destructive so the service worker could recover.
|
||||
defer func() {
|
||||
@@ -74,7 +75,7 @@ func dockingRequestHandler(ctx context.Context) error {
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
case <-wc.Done():
|
||||
return nil
|
||||
case ship := <-dockingRequests:
|
||||
// Ignore nil ships.
|
||||
@@ -82,7 +83,7 @@ func dockingRequestHandler(ctx context.Context) error {
|
||||
continue
|
||||
}
|
||||
|
||||
if err := checkDockingPermission(ctx, ship); err != nil {
|
||||
if err := checkDockingPermission(wc.Ctx(), ship); err != nil {
|
||||
log.Warningf("spn/captain: denied ship from %s to dock at pier %s: %s", ship.RemoteAddr(), ship.Transport().String(), err)
|
||||
} else {
|
||||
handleDockingRequest(ship)
|
||||
@@ -123,8 +124,8 @@ func handleDockingRequest(ship ships.Ship) {
|
||||
return
|
||||
}
|
||||
|
||||
module.StartWorker("start crane", func(ctx context.Context) error {
|
||||
_ = crane.Start(ctx)
|
||||
module.mgr.Go("start crane", func(wc *mgr.WorkerCtx) error {
|
||||
_ = crane.Start(wc.Ctx())
|
||||
// Crane handles errors internally.
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user