Move enabling metric persistence to core module prep phase

safing · Oct 13, 2023 · e6c4937 · e6c4937
1 parent 48bccad
commit e6c4937
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/base/module.go b/core/base/module.go
@@ -2,8 +2,6 @@ package base
 
 import (
 	_ "github.com/safing/portbase/config"
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/metrics"
 	"github.com/safing/portbase/modules"
 	_ "github.com/safing/portbase/rng"
 )
@@ -33,11 +31,6 @@ func start() error {
 		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()
 
 	return nil

diff --git a/core/core.go b/core/core.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/safing/portbase/log"
+	"github.com/safing/portbase/metrics"
 	"github.com/safing/portbase/modules"
 	"github.com/safing/portbase/modules/subsystems"
 	_ "github.com/safing/portmaster/broadcasts"
@@ -60,6 +62,11 @@ func prep() error {
 		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
 }