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/metropolis/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index b68c7f9..ac048d6 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -12,6 +12,7 @@
importpath = "source.monogon.dev/metropolis/node/core/consensus",
visibility = ["//:__subpackages__"],
deps = [
+ "//go/logging",
"//metropolis/node",
"//metropolis/node/core/consensus/client",
"//metropolis/node/core/identity",
@@ -44,6 +45,7 @@
"block-network",
],
deps = [
+ "//go/logging",
"//metropolis/node/core/localstorage",
"//metropolis/node/core/localstorage/declarative",
"//metropolis/test/util",
diff --git a/metropolis/node/core/consensus/logparser.go b/metropolis/node/core/consensus/logparser.go
index b403423..f825431 100644
--- a/metropolis/node/core/consensus/logparser.go
+++ b/metropolis/node/core/consensus/logparser.go
@@ -8,6 +8,7 @@
"strings"
"time"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/osbase/logbuffer"
"source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/logtree/unraw"
@@ -80,13 +81,13 @@
// Convert zap level into logtree severity.
switch e.Level {
case "info":
- out.Severity = logtree.INFO
+ out.Severity = logging.INFO
case "warn":
- out.Severity = logtree.WARNING
+ out.Severity = logging.WARNING
case "error":
- out.Severity = logtree.ERROR
+ out.Severity = logging.ERROR
case "fatal", "panic", "dpanic":
- out.Severity = logtree.FATAL
+ out.Severity = logging.FATAL
}
// Sort extra keys alphabetically.
diff --git a/metropolis/node/core/consensus/logparser_test.go b/metropolis/node/core/consensus/logparser_test.go
index cfe6fea..101211c 100644
--- a/metropolis/node/core/consensus/logparser_test.go
+++ b/metropolis/node/core/consensus/logparser_test.go
@@ -6,6 +6,7 @@
"github.com/google/go-cmp/cmp"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/osbase/logbuffer"
"source.monogon.dev/osbase/logtree"
)
@@ -35,7 +36,7 @@
&logtree.ExternalLeveledPayload{
Message: `configuring peer listeners, listen-peer-urls: ["https://[::]:7834"]`,
Timestamp: timeParse("2021-07-06T17:18:24.368Z"),
- Severity: logtree.INFO,
+ Severity: logging.INFO,
File: "etcd.go",
Line: 117,
},
@@ -46,7 +47,7 @@
&logtree.ExternalLeveledPayload{
Message: `added member, added-peer-id: "9642132f5d0d99e2", added-peer-peer-urls: ["https://metropolis-eb8d68cfb52711ad04c339abdeea74ed:7834"], cluster-id: "137c8e19524788c1", local-member-id: "9642132f5d0d99e2"`,
Timestamp: timeParse("2021-07-06T17:21:49.462Z"),
- Severity: logtree.INFO,
+ Severity: logging.INFO,
File: "cluster.go",
Line: 392,
},