aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mike@crute.us>2022-05-21 23:18:49 -0700
committerMike Crute <mike@crute.us>2022-05-21 23:18:49 -0700
commit133e0f14fb906f8acac6cf05e7fe7f9ed45aa8b5 (patch)
tree80b15af5af3c29de4d8a9dc0315bc67347e40f64
parenta936b621b2b124eca7b4cefdb9d731cc06b6b18b (diff)
downloadgolib-133e0f14fb906f8acac6cf05e7fe7f9ed45aa8b5.tar.bz2
golib-133e0f14fb906f8acac6cf05e7fe7f9ed45aa8b5.tar.xz
golib-133e0f14fb906f8acac6cf05e7fe7f9ed45aa8b5.zip
vault: unify logging interfacesvault/v0.2.5echo/v0.6.2
-rw-r--r--vault/go.mod1
-rw-r--r--vault/go.sum2
-rw-r--r--vault/logger.go7
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
3go 1.17 3go 1.17
4 4
5require ( 5require (
6 code.crute.us/mcrute/golib v0.3.7
6 github.com/hashicorp/vault/api v1.5.0 7 github.com/hashicorp/vault/api v1.5.0
7 github.com/hashicorp/vault/api/auth/approle v0.1.1 8 github.com/hashicorp/vault/api/auth/approle v0.1.1
8 github.com/mitchellh/mapstructure v1.4.2 9 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 @@
1cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 1cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 2cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
3code.crute.us/mcrute/golib v0.3.7 h1:6u2iNptLFEfrqtN049A4P6lh0arokgU8k5V4yWBXz5c=
4code.crute.us/mcrute/golib v0.3.7/go.mod h1:CuQYhrdRu6MoBngOB6ZdSSr2QFow2yVE/WFzbXQYwYg=
3github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 5github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= 6github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
5github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= 7github.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 (
4 "context" 4 "context"
5 "sync" 5 "sync"
6 6
7 "code.crute.us/mcrute/golib/log"
7 "code.crute.us/mcrute/golib/service" 8 "code.crute.us/mcrute/golib/service"
8) 9)
9 10
10type VaultInfofLogger interface { 11func MakeRenewalLogger(rc chan *Renewal, log log.LeveledLogger) service.RunnerFunc {
11 Infof(string, ...interface{})
12}
13
14func MakeRenewalLogger(rc chan *Renewal, log VaultInfofLogger) service.RunnerFunc {
15 return func(ctx context.Context, wg *sync.WaitGroup) error { 12 return func(ctx context.Context, wg *sync.WaitGroup) error {
16 wg.Add(1) 13 wg.Add(1)
17 defer wg.Done() 14 defer wg.Done()