From b17123c57524c0fcbdaa3e83688d7215c01601f3 Mon Sep 17 00:00:00 2001
From: Samantha <hello@entropy.cat>
Date: Thu, 14 Sep 2023 13:21:49 -0400
Subject: [PATCH] redis: Small Lookup cleanup (#7084)

Small changes left over from #7042
---
 redis/lookup.go | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/redis/lookup.go b/redis/lookup.go
index 7becdb1b2..dc9a3f994 100644
--- a/redis/lookup.go
+++ b/redis/lookup.go
@@ -54,29 +54,20 @@ func NewLookup(srvLookups []cmd.ServiceDomain, dnsAuthority string, frequency ti
 	// Set default timeout to 90% of the update frequency.
 	updateTimeout := updateFrequency - updateFrequency/10
 
-	var lookup *Lookup
+	lookup := &Lookup{
+		srvLookups:      srvLookups,
+		ring:            ring,
+		logger:          logger,
+		updateFrequency: updateFrequency,
+		updateTimeout:   updateTimeout,
+		dnsAuthority:    dnsAuthority,
+	}
+
 	if dnsAuthority == "" {
 		// Use the system DNS resolver.
-		lookup = &Lookup{
-			srvLookups:      srvLookups,
-			ring:            ring,
-			logger:          logger,
-			updateFrequency: updateFrequency,
-			updateTimeout:   updateTimeout,
-			resolver:        net.DefaultResolver,
-			dnsAuthority:    dnsAuthority,
-		}
+		lookup.resolver = net.DefaultResolver
 	} else {
 		// Setup a custom DNS resolver.
-		lookup = &Lookup{
-			srvLookups:      srvLookups,
-			ring:            ring,
-			logger:          logger,
-			updateFrequency: updateFrequency,
-			updateTimeout:   updateTimeout,
-			dnsAuthority:    dnsAuthority,
-		}
-
 		host, port, err := net.SplitHostPort(dnsAuthority)
 		if err != nil {
 			// Assume only hostname or IPv4 address was specified.
@@ -97,7 +88,6 @@ func NewLookup(srvLookups []cmd.ServiceDomain, dnsAuthority string, frequency ti
 	ctx, cancel := context.WithTimeout(context.Background(), updateTimeout)
 	defer cancel()
 	tempErr, nonTempErr := lookup.updateNow(ctx)
-
 	if tempErr != nil {
 		// Log and discard temporary errors, as they're likely to be transient
 		// (e.g. network connectivity issues).