vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 19:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix broadcast notifications

Browse source
This commit is contained in:
Vladimir Stoilov 2024-12-11 16:13:06 +02:00
parent b3c867efc6
commit 0997f1ce26
No known key found for this signature in database
GPG key ID: 2F190B67A43A81AF
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
service/broadcasts/data.go
View file

@ -5,6 +5,7 @@ import (
"time" "time"
"github.com/safing/portmaster/base/config" "github.com/safing/portmaster/base/config"
"github.com/safing/portmaster/service/core"
"github.com/safing/portmaster/service/intel/geoip" "github.com/safing/portmaster/service/intel/geoip"
"github.com/safing/portmaster/service/netenv" "github.com/safing/portmaster/service/netenv"
"github.com/safing/portmaster/spn/access" "github.com/safing/portmaster/spn/access"
@ -17,19 +18,18 @@ var portmasterStarted = time.Now()
func collectData() interface{} { func collectData() interface{} {
data := make(map[string]interface{}) data := make(map[string]interface{})
// TODO(vladimir)
// Get data about versions. // Get data about versions.
// versions := updates.GetSimpleVersions() versions := core.GetSimpleVersions()
// data["Updates"] = versions data["Updates"] = versions
// data["Version"] = versions.Build.Version data["Version"] = versions.Build.Version
// numericVersion, err := MakeNumericVersion(versions.Build.Version) numericVersion, err := MakeNumericVersion(versions.Build.Version)
// if err != nil { if err != nil {
// data["NumericVersion"] = &DataError{ data["NumericVersion"] = &DataError{
// Error: err, Error: err,
// } }
// } else { } else {
// data["NumericVersion"] = numericVersion data["NumericVersion"] = numericVersion
// } }
// Get data about install. // Get data about install.
installInfo, err := GetInstallInfo() installInfo, err := GetInstallInfo()

4
service/broadcasts/module.go
View file

@ -43,10 +43,6 @@ var (
startOnce sync.Once startOnce sync.Once
) )
func init() {
// module = modules.Register("broadcasts", prep, start, nil, "updates", "netenv", "notifications")
}
func prep() error { func prep() error {
// Register API endpoints. // Register API endpoints.
if err := registerAPIEndpoints(); err != nil { if err := registerAPIEndpoints(); err != nil {

1
service/core/core.go
View file

@ -11,7 +11,6 @@ import (
"github.com/safing/portmaster/base/log" "github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/base/metrics" "github.com/safing/portmaster/base/metrics"
"github.com/safing/portmaster/base/utils/debug" "github.com/safing/portmaster/base/utils/debug"
_ "github.com/safing/portmaster/service/broadcasts"
"github.com/safing/portmaster/service/mgr" "github.com/safing/portmaster/service/mgr"
_ "github.com/safing/portmaster/service/netenv" _ "github.com/safing/portmaster/service/netenv"
_ "github.com/safing/portmaster/service/netquery" _ "github.com/safing/portmaster/service/netquery"

1
service/network/api.go
View file

@ -93,7 +93,6 @@ func debugInfo(ar *api.Request) (data []byte, err error) {
config.AddToDebugInfo(di) config.AddToDebugInfo(di)
// Detailed information. // Detailed information.
// TODO(vladimir): updates.AddToDebugInfo(di)
// compat.AddToDebugInfo(di) // TODO: Cannot use due to interception import requirement which we don't want for SPN Hubs. // compat.AddToDebugInfo(di) // TODO: Cannot use due to interception import requirement which we don't want for SPN Hubs.
di.AddGoroutineStack() di.AddGoroutineStack()