From: Tom Clegg <tom@curii.com>
Date: Tue, 28 Jun 2022 14:39:33 +0000 (-0400)
Subject: 16561: Rearrange control flow for clarity.
X-Git-Tag: 2.5.0~128^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/04666c2304ea7700243756cfb0278cc139e969ce

16561: Rearrange control flow for clarity.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 5687ec1dad..b5e395bec8 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -241,10 +241,11 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 		return arvados.URL{}, arvados.URL{}, fmt.Errorf("unknown service name %q", prog)
 	}
 
-	if want := os.Getenv("ARVADOS_SERVICE_INTERNAL_URL"); want == "" {
-	} else if url, err := url.Parse(want); err != nil {
-		return arvados.URL{}, arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err)
-	} else {
+	if want := os.Getenv("ARVADOS_SERVICE_INTERNAL_URL"); want != "" {
+		url, err := url.Parse(want)
+		if err != nil {
+			return arvados.URL{}, arvados.URL{}, fmt.Errorf("$ARVADOS_SERVICE_INTERNAL_URL (%q): %s", want, err)
+		}
 		if url.Path == "" {
 			url.Path = "/"
 		}