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:
58
base/notifications/module-mirror.go
Normal file
58
base/notifications/module-mirror.go
Normal file
@@ -0,0 +1,58 @@
|
||||
package notifications
|
||||
|
||||
import (
|
||||
"github.com/safing/portmaster/base/log"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
)
|
||||
|
||||
// SyncWithState syncs the notification to a state in the given state mgr.
|
||||
// The state will be removed when the notification is removed.
|
||||
func (n *Notification) SyncWithState(state *mgr.StateMgr) {
|
||||
if state == nil {
|
||||
log.Warningf("notifications: invalid usage: cannot attach %s to nil module", n.EventID)
|
||||
return
|
||||
}
|
||||
|
||||
n.lock.Lock()
|
||||
defer n.lock.Unlock()
|
||||
|
||||
if n.Meta().IsDeleted() {
|
||||
log.Warningf("notifications: cannot attach module to deleted notification %s", n.EventID)
|
||||
return
|
||||
}
|
||||
if n.State != Active {
|
||||
log.Warningf("notifications: cannot attach module to inactive notification %s", n.EventID)
|
||||
return
|
||||
}
|
||||
if n.belongsTo != nil {
|
||||
log.Warningf("notifications: cannot override attached module for notification %s", n.EventID)
|
||||
return
|
||||
}
|
||||
|
||||
// Attach module.
|
||||
n.belongsTo = state
|
||||
|
||||
// Create state with same ID.
|
||||
state.Add(mgr.State{
|
||||
ID: n.EventID,
|
||||
Name: n.Title,
|
||||
Message: n.Message,
|
||||
Type: notifTypeToStateType(n.Type),
|
||||
Data: n.EventData,
|
||||
})
|
||||
}
|
||||
|
||||
func notifTypeToStateType(notifType Type) mgr.StateType {
|
||||
switch notifType {
|
||||
case Info:
|
||||
return mgr.StateTypeHint
|
||||
case Warning:
|
||||
return mgr.StateTypeWarning
|
||||
case Prompt:
|
||||
return mgr.StateTypeUndefined
|
||||
case Error:
|
||||
return mgr.StateTypeError
|
||||
default:
|
||||
return mgr.StateTypeUndefined
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user