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_test.go b/osbase/logtree/logtree_test.go
index 54eabb7..8ddd3d0 100644
--- a/osbase/logtree/logtree_test.go
+++ b/osbase/logtree/logtree_test.go
@@ -21,6 +21,8 @@
"strings"
"testing"
"time"
+
+ "source.monogon.dev/go/logging"
)
func expect(tree *LogTree, t *testing.T, dn DN, entries ...string) string {
@@ -227,13 +229,13 @@
for _, te := range []struct {
ix int
- severity Severity
+ severity logging.Severity
message string
}{
- {0, ERROR, "i am an error"},
- {1, WARNING, "i am a warning"},
- {2, INFO, "i am informative"},
- {3, INFO, "i am a zero-level debug"},
+ {0, logging.ERROR, "i am an error"},
+ {1, logging.WARNING, "i am a warning"},
+ {2, logging.INFO, "i am informative"},
+ {3, logging.INFO, "i am a zero-level debug"},
} {
p := reader.Backlog[te.ix]
if want, got := te.severity, p.Leveled.Severity(); want != got {
@@ -255,7 +257,7 @@
tree.MustLeveledFor("main").Info("i am informative")
tree.MustLeveledFor("main").V(0).Info("i am a zero-level debug")
- reader, err := tree.Read("main", WithBacklog(BacklogAllAvailable), LeveledWithMinimumSeverity(WARNING))
+ reader, err := tree.Read("main", WithBacklog(BacklogAllAvailable), LeveledWithMinimumSeverity(logging.WARNING))
if err != nil {
t.Fatalf("Read: %v", err)
}
@@ -311,7 +313,7 @@
&LogEntry{
Leveled: &LeveledPayload{
messages: []string{"Hello there!"},
- severity: WARNING,
+ severity: logging.WARNING,
},
DN: "root.role.kubernetes.run.kubernetes.apiserver",
},
@@ -322,7 +324,7 @@
&LogEntry{
Leveled: &LeveledPayload{
messages: []string{"Hello there!", "I am multiline."},
- severity: WARNING,
+ severity: logging.WARNING,
},
DN: "root.role.kubernetes.run.kubernetes.apiserver",
},
@@ -336,7 +338,7 @@
&LogEntry{
Leveled: &LeveledPayload{
messages: []string{"Hello there! I am a very long string, and I will get wrapped to 120 columns because that's just how life is for long strings."},
- severity: WARNING,
+ severity: logging.WARNING,
},
DN: "root.role.kubernetes.run.kubernetes.apiserver",
},
@@ -350,7 +352,7 @@
&LogEntry{
Leveled: &LeveledPayload{
messages: []string{"Hello there!"},
- severity: WARNING,
+ severity: logging.WARNING,
},
DN: "root.role.kubernetes.run.kubernetes.apiserver",
},
@@ -363,7 +365,7 @@
&LogEntry{
Leveled: &LeveledPayload{
messages: []string{"Hello there!"},
- severity: WARNING,
+ severity: logging.WARNING,
},
DN: "root.role.kubernetes.run.kubernetes.apiserver",
},