16561: Rearrange control flow for clarity.

[arvados.git] / lib / service / cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 5687ec1dadcddb3f3f6a1e3458a46eeca45dc990..b5e395bec828c879a9e86ac646cf82026873422c 100644 (file)
--- 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)
        }
 
                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 = "/"
                }
                if url.Path == "" {
                        url.Path = "/"
                }