1 files changed, 13 insertions, 2 deletions

diff --git a/echo/vault.go b/echo/vault.go
index 13a7407..68de60b 100644
--- a/echo/vault.go
+++ b/echo/vault.go
@@ -2,6 +2,7 @@ package echo
 
 import (
         "context"
+        "sync"
 
         "code.crute.us/mcrute/golib/secrets"
         "code.crute.us/mcrute/golib/service"
@@ -51,6 +52,16 @@ func MakeVaultSecretsClient(ctx context.Context) (secrets.ClientManager, error)
 // failure handler will terminate the application if a critical
 // credential renewal failure occurs.
 func AttachSecretsClient(c secrets.ClientManager, cancel func(), run *service.AppRunner, log echo.Logger) {
-        run.AddBackgroundJob(c.Run)
-        run.AddBackgroundJob(secrets.MakeRenewalLogger(c, log, cancel))
+        run.AddBackgroundJob(func(ctx context.Context, wg *sync.WaitGroup) error {
+                log.Info("Starting credential renewal handler")
+                err := c.Run(ctx, wg)
+                log.Info("Shutting down credential renewal handler")
+                return err
+        })
+        run.AddBackgroundJob(func(ctx context.Context, wg *sync.WaitGroup) error {
+                log.Info("Starting credential renewal logger")
+                err := secrets.MakeRenewalLogger(c, log, cancel)(ctx, wg)
+                log.Info("Shutting down credential renewal logger")
+                return err
+        })
 }