From ea435db9a926c1c659395cf1826cbe4f2af0fdd8 Mon Sep 17 00:00:00 2001 From: Andrei Mihu Date: Fri, 29 Oct 2021 22:40:54 +0100 Subject: [PATCH] Simplify database DNS rotation hostname resolver. --- server/db.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/db.go b/server/db.go index 7c6754ed1..0d7f5125e 100644 --- a/server/db.go +++ b/server/db.go @@ -55,7 +55,8 @@ func DbConnect(ctx context.Context, logger *zap.Logger, config Config) (*sql.DB, } // Resolve initial database address based on host before connecting. - resolvedAddr, resolvedAddrMap := dbResolveAddress(ctx, logger, parsedURL.Host) + dbHostname := parsedURL.Hostname() + resolvedAddr, resolvedAddrMap := dbResolveAddress(ctx, logger, dbHostname) logger.Debug("Complete database connection URL", zap.String("raw_url", parsedURL.String())) db, err := sql.Open("pgx", parsedURL.String()) @@ -89,7 +90,7 @@ func DbConnect(ctx context.Context, logger *zap.Logger, config Config) (*sql.DB, case <-ctx.Done(): return case <-ticker.C: - newResolvedAddr, newResolvedAddrMap := dbResolveAddress(ctx, logger, parsedURL.Host) + newResolvedAddr, newResolvedAddrMap := dbResolveAddress(ctx, logger, dbHostname) if len(resolvedAddr) == 0 { // Could only happen when initial resolve above failed, and all resolves since have also failed. // Trust the database driver in this case. -- GitLab