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/tpm/tpm.go b/osbase/tpm/tpm.go
index b77c36d..f664c75 100644
--- a/osbase/tpm/tpm.go
+++ b/osbase/tpm/tpm.go
@@ -41,7 +41,7 @@
tpmpb "source.monogon.dev/osbase/tpm/proto"
- "source.monogon.dev/osbase/logtree"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/osbase/sysfs"
)
@@ -126,7 +126,7 @@
// TPM represents a high-level interface to a connected TPM 2.0
type TPM struct {
- logger logtree.LeveledLogger
+ logger logging.Leveled
device io.ReadWriteCloser
// We keep the AK loaded since it's used fairly often and deriving it is
@@ -137,7 +137,7 @@
// Initialize finds and opens the TPM (if any). If there is no TPM available it
// returns ErrNotExists
-func Initialize(logger logtree.LeveledLogger) error {
+func Initialize(logger logging.Leveled) error {
lock.Lock()
defer lock.Unlock()
tpmDir, err := os.Open("/sys/class/tpm")