From 133e0f14fb906f8acac6cf05e7fe7f9ed45aa8b5 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sat, 21 May 2022 23:18:49 -0700 Subject: vault: unify logging interfaces --- vault/go.mod | 1 + vault/go.sum | 2 ++ vault/logger.go | 7 ++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vault/go.mod b/vault/go.mod index 05d59a0..8137884 100644 --- a/vault/go.mod +++ b/vault/go.mod @@ -3,6 +3,7 @@ module code.crute.us/mcrute/golib/vault go 1.17 require ( + code.crute.us/mcrute/golib v0.3.7 github.com/hashicorp/vault/api v1.5.0 github.com/hashicorp/vault/api/auth/approle v0.1.1 github.com/mitchellh/mapstructure v1.4.2 diff --git a/vault/go.sum b/vault/go.sum index c034144..ac27e89 100644 --- a/vault/go.sum +++ b/vault/go.sum @@ -1,5 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +code.crute.us/mcrute/golib v0.3.7 h1:6u2iNptLFEfrqtN049A4P6lh0arokgU8k5V4yWBXz5c= +code.crute.us/mcrute/golib v0.3.7/go.mod h1:CuQYhrdRu6MoBngOB6ZdSSr2QFow2yVE/WFzbXQYwYg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/vault/logger.go b/vault/logger.go index a83eb33..5412ca3 100644 --- a/vault/logger.go +++ b/vault/logger.go @@ -4,14 +4,11 @@ import ( "context" "sync" + "code.crute.us/mcrute/golib/log" "code.crute.us/mcrute/golib/service" ) -type VaultInfofLogger interface { - Infof(string, ...interface{}) -} - -func MakeRenewalLogger(rc chan *Renewal, log VaultInfofLogger) service.RunnerFunc { +func MakeRenewalLogger(rc chan *Renewal, log log.LeveledLogger) service.RunnerFunc { return func(ctx context.Context, wg *sync.WaitGroup) error { wg.Add(1) defer wg.Done() -- cgit v1.2.3