Merge pull request #1461 from breml/early-return

chore: Happy path on the left, early return

Author: stgraber

internal/server/db/query/retry.go

@@ -23,35 +23,37 @@ const maxRetries = 250
 //
 // This should by typically used to wrap transactions.
 func Retry(ctx context.Context, f func(ctx context.Context) error) error {
-	// TODO: the retry loop should be configurable.
 	var err error
 	for i := 0; i < maxRetries; i++ {
 		err = f(ctx)
-		if err != nil {
-			if errors.Is(err, context.Canceled) {
-				break
-			}
-
-			// No point in re-trying or logging a no-row or not found error.
-			if errors.Is(err, sql.ErrNoRows) || api.StatusErrorCheck(err, http.StatusNotFound) {
-				break
-			}
-
-			// Process actual errors.
-			if IsRetriableError(err) {
-				if i == maxRetries {
-					logger.Warn("Database error, giving up", logger.Ctx{"attempt": i, "err": err})
-					break
-				}
-
-				logger.Debug("Database error, retrying", logger.Ctx{"attempt": i, "err": err})
-				time.Sleep(jitter.Deviation(nil, 0.8)(100 * time.Millisecond))
-				continue
-			} else {
-				logger.Debug("Database error", logger.Ctx{"err": err})
-			}
+		if err == nil {
+			// The function succeeded, we're done here.
+			break
 		}
-		break
+
+		if errors.Is(err, context.Canceled) {
+			// The function was canceled, don't retry.
+			break
+		}
+
+		// No point in re-trying or logging a no-row or not found error.
+		if errors.Is(err, sql.ErrNoRows) || api.StatusErrorCheck(err, http.StatusNotFound) {
+			break
+		}
+
+		// Process actual errors.
+		if !IsRetriableError(err) {
+			logger.Debug("Database error", logger.Ctx{"err": err})
+			break
+		}
+
+		if i == maxRetries {
+			logger.Warn("Database error, giving up", logger.Ctx{"attempt": i, "err": err})
+			break
+		}
+
+		logger.Debug("Database error, retrying", logger.Ctx{"attempt": i, "err": err})
+		time.Sleep(jitter.Deviation(nil, 0.8)(100 * time.Millisecond))
 	}
 
 	return err

internal/util/network.go

@@ -17,15 +17,17 @@ func CanonicalNetworkAddress(address string, defaultPort int) string {
 		if ip != nil {
 			// If the input address is a bare IP address, then convert it to a proper listen address
 			// using the canonical IP with default port and wrap IPv6 addresses in square brackets.
-			address = net.JoinHostPort(ip.String(), fmt.Sprintf("%d", defaultPort))
-		} else {
-			// Otherwise assume this is either a host name or a partial address (e.g `[::]`) without
-			// a port number, so append the default port.
-			address = fmt.Sprintf("%s:%d", address, defaultPort)
+			return net.JoinHostPort(ip.String(), fmt.Sprintf("%d", defaultPort))
 		}
-	} else if port == "" && address[len(address)-1] == ':' {
+
+		// Otherwise assume this is either a host name or a partial address (e.g `[::]`) without
+		// a port number, so append the default port.
+		return fmt.Sprintf("%s:%d", address, defaultPort)
+	}
+
+	if port == "" && address[len(address)-1] == ':' {
 		// An address that ends with a trailing colon will be parsed as having an empty port.
-		address = net.JoinHostPort(host, fmt.Sprintf("%d", defaultPort))
+		return net.JoinHostPort(host, fmt.Sprintf("%d", defaultPort))
 	}
 
 	return address