github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move enabling metric persistence to core module prep phase

Browse Source
This commit is contained in:
Daniel
2023-10-12 16:54:50 +02:00
parent 48bccad1bf
commit e6c4937f8f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/base/module.go
View File

@@ -2,8 +2,6 @@ package base
import ( import (
_ "github.com/safing/portbase/config" _ "github.com/safing/portbase/config"
"github.com/safing/portbase/log"
"github.com/safing/portbase/metrics"
"github.com/safing/portbase/modules" "github.com/safing/portbase/modules"
_ "github.com/safing/portbase/rng" _ "github.com/safing/portbase/rng"
) )
@@ -33,11 +31,6 @@ func start() error {
return err return err
} }
// Set metrics storage key and load them from db.
if err := metrics.EnableMetricPersistence("core:metrics/storage"); err != nil {
log.Warningf("core: failed to load persisted metrics from db: %s", err)
}
registerLogCleaner() registerLogCleaner()
return nil return nil

7
core/core.go
View File

@@ -5,6 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/safing/portbase/log"
"github.com/safing/portbase/metrics"
"github.com/safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/safing/portbase/modules/subsystems" "github.com/safing/portbase/modules/subsystems"
_ "github.com/safing/portmaster/broadcasts" _ "github.com/safing/portmaster/broadcasts"
@@ -60,6 +62,11 @@ func prep() error {
return err return err
} }
// Enable persistent metrics.
if err := metrics.EnableMetricPersistence("core:metrics/storage"); err != nil {
log.Warningf("core: failed to enable persisted metrics: %s", err)
}
return nil return nil
} }