From 4d06b3e94287a9dd5488d654fff8f29e2acdc4c8 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 28 May 2019 18:56:37 +0200 Subject: [PATCH] Improve logging info when connecting to the database --- internal/db/connector.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/internal/db/connector.go b/internal/db/connector.go index 89648b966..f80518983 100644 --- a/internal/db/connector.go +++ b/internal/db/connector.go @@ -27,7 +27,11 @@ func TryToConnect(ctx context.Context, log *zap.Logger, name, dsn, profiler stri defer close(connErrCh) - log.Debug("connecting to the database", zap.String("dsn", dsn)) + log.Debug("connecting to the database", + zap.String("dsn", dsn), + zap.Int("tries", maxTries), + zap.Duration("delay", delay), + zap.Duration("timeout", timeout)) go func() { var ( @@ -45,7 +49,7 @@ func TryToConnect(ctx context.Context, log *zap.Logger, name, dsn, profiler stri db, err = factory.Database.Get(name) if err != nil { log.Warn( - "could not connect", + "could not connect to the database", zap.Error(err), zap.Int("try", try), zap.String("dsn", dsn), @@ -62,6 +66,8 @@ func TryToConnect(ctx context.Context, log *zap.Logger, name, dsn, profiler stri } } + log.Info("connected to the database", zap.String("dsn", dsn)) + // Connected break @@ -80,7 +86,6 @@ func TryToConnect(ctx context.Context, log *zap.Logger, name, dsn, profiler stri return nil, errors.Errorf("db connection for %q cancelled", name) } - // @todo: profiling as an external service? switch profiler { case "stdout": db.Profiler = &factory.Database.ProfilerStdout @@ -89,8 +94,6 @@ func TryToConnect(ctx context.Context, log *zap.Logger, name, dsn, profiler stri db.Profiler = ZapProfiler(log. WithOptions(zap.AddCallerSkip(3)), ) - default: - log.Info("no database query profiler selected") } if err != nil {