metropolis/proto: move log-related types to common
Having them in API is kinda weird, especially as we're
generating/parsing them from a few libraries already.
Change-Id: I87b4b51f151443c60b87e3e50753c395fcf6e845
Reviewed-on: https://review.monogon.dev/c/monogon/+/1437
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/pkg/logtree/leveled.go b/metropolis/pkg/logtree/leveled.go
index 6e44ef4..5c57222 100644
--- a/metropolis/pkg/logtree/leveled.go
+++ b/metropolis/pkg/logtree/leveled.go
@@ -19,7 +19,7 @@
import (
"fmt"
- apb "source.monogon.dev/metropolis/proto/api"
+ cpb "source.monogon.dev/metropolis/proto/common"
)
// LeveledLogger is a generic interface for glog-style logging. There are four
@@ -144,32 +144,32 @@
}
}
-func SeverityFromProto(s apb.LeveledLogSeverity) (Severity, error) {
+func SeverityFromProto(s cpb.LeveledLogSeverity) (Severity, error) {
switch s {
- case apb.LeveledLogSeverity_INFO:
+ case cpb.LeveledLogSeverity_INFO:
return INFO, nil
- case apb.LeveledLogSeverity_WARNING:
+ case cpb.LeveledLogSeverity_WARNING:
return WARNING, nil
- case apb.LeveledLogSeverity_ERROR:
+ case cpb.LeveledLogSeverity_ERROR:
return ERROR, nil
- case apb.LeveledLogSeverity_FATAL:
+ case cpb.LeveledLogSeverity_FATAL:
return FATAL, nil
default:
return "", fmt.Errorf("unknown severity value %d", s)
}
}
-func (s Severity) ToProto() apb.LeveledLogSeverity {
+func (s Severity) ToProto() cpb.LeveledLogSeverity {
switch s {
case INFO:
- return apb.LeveledLogSeverity_INFO
+ return cpb.LeveledLogSeverity_INFO
case WARNING:
- return apb.LeveledLogSeverity_WARNING
+ return cpb.LeveledLogSeverity_WARNING
case ERROR:
- return apb.LeveledLogSeverity_ERROR
+ return cpb.LeveledLogSeverity_ERROR
case FATAL:
- return apb.LeveledLogSeverity_FATAL
+ return cpb.LeveledLogSeverity_FATAL
default:
- return apb.LeveledLogSeverity_INVALID
+ return cpb.LeveledLogSeverity_INVALID
}
}