osbase/logtree.LeveledLogger -> go/logging.Leveled
This factors out the common leveled logger interface out of the logtree.
We want to use the same interface outside of logtree/supervisor usage
within the resolver code, which will be exposed to clients.
Change-Id: I299e76d91e8cefddf8f36f1e58432418c4694df2
Reviewed-on: https://review.monogon.dev/c/monogon/+/3411
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/osbase/logtree/logtree_access.go b/osbase/logtree/logtree_access.go
index b601ea4..30ceccf 100644
--- a/osbase/logtree/logtree_access.go
+++ b/osbase/logtree/logtree_access.go
@@ -19,6 +19,8 @@
import (
"errors"
"sync/atomic"
+
+ "source.monogon.dev/go/logging"
)
// LogReadOption describes options for the LogTree.Read call.
@@ -28,7 +30,7 @@
withBacklog int
onlyLeveled bool
onlyRaw bool
- leveledWithMinimumSeverity Severity
+ leveledWithMinimumSeverity logging.Severity
}
// WithChildren makes Read return/stream data for both a given DN and all its
@@ -54,7 +56,7 @@
// LeveledWithMinimumSeverity makes Read return only log entries that are at least
// at a given Severity. If only leveled entries are needed, OnlyLeveled must be
// used. This is a no-op when OnlyRaw is used.
-func LeveledWithMinimumSeverity(s Severity) LogReadOption {
+func LeveledWithMinimumSeverity(s logging.Severity) LogReadOption {
return LogReadOption{leveledWithMinimumSeverity: s}
}
@@ -111,7 +113,7 @@
var backlog int
var stream bool
var recursive bool
- var leveledSeverity Severity
+ var leveledSeverity logging.Severity
var onlyRaw, onlyLeveled bool
for _, opt := range opts {