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/klog.go b/osbase/logtree/klog.go
index ad7e162..dca5a82 100644
--- a/osbase/logtree/klog.go
+++ b/osbase/logtree/klog.go
@@ -24,6 +24,7 @@
"strings"
"time"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/osbase/logbuffer"
)
@@ -47,7 +48,7 @@
// lines do not necessarily have their year aleays equal to the current year, as
// the code handles the edge case of parsing a line from the end of a previous
// year at the beginning of the next).
-func KLogParser(logger LeveledLogger) io.WriteCloser {
+func KLogParser(logger logging.Leveled) io.WriteCloser {
p, ok := logger.(*leveledPublisher)
if !ok {
// Fail fast, as this is a programming error.
@@ -121,16 +122,16 @@
lineS := parts[7]
message := parts[8]
- var severity Severity
+ var severity logging.Severity
switch severityS {
case "I":
- severity = INFO
+ severity = logging.INFO
case "W":
- severity = WARNING
+ severity = logging.WARNING
case "E":
- severity = ERROR
+ severity = logging.ERROR
case "F":
- severity = FATAL
+ severity = logging.FATAL
default:
return nil
}