Use "host" as var name to avoid shadowing the url var and don't skip …

…the service.Registry lookup if it's enabled

lile.go

@@ -114,20 +114,16 @@ func AddStreamInterceptor(sint grpc.StreamServerInterceptor) {
 // if not available via the registry
 func URLForService(name string) string {
 
-	var url string
+	host := name
 	port := "80"
 
 	if val, ok := os.LookupEnv("SERVICE_HOST_OVERRIDE"); ok {
-		url = val
+		host = val
 	}
 	if val, ok := os.LookupEnv("SERVICE_PORT_OVERRIDE"); ok {
 		port = val
 	}
 
-	if url != "" {
-		return fmt.Sprintf("%s:%s", url, port)
-	}
-
 	if service.Registry != nil {
 		url, err := service.Registry.Get(name)
 		if err != nil {
@@ -136,7 +132,8 @@ func URLForService(name string) string {
 		return url
 	}
 
-	return name + ":80"
+	return fmt.Sprintf("%s:%s", host, port)
+
 }
 
 // ContextClientInterceptor passes around headers for tracing and linkerd