15954: Return controller URL when ready.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index cd2582d03f2c508a317bdf818da169f215786a33..04f6838b75e352afa8e4d0d8f4bbb2cdd0b87fa9 100644 (file)
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -103,8 +103,8 @@ func (bootCommand) RunCommand(prog string, args []string, stdin io.Reader, stdou
 
        boot.Start(ctx, cfg)
        defer boot.Stop()
-       if boot.WaitReady() {
-               fmt.Fprintln(stdout, boot.cluster.Services.Controller.ExternalURL)
+       if url, ok := boot.WaitReady(); ok {
+               fmt.Fprintln(stdout, url)
                <-ctx.Done() // wait for signal
                return 0
        } else {
@@ -305,11 +305,11 @@ func (boot *Booter) Stop() {
        <-boot.done
 }
 
-func (boot *Booter) WaitReady() bool {
+func (boot *Booter) WaitReady() (*arvados.URL, bool) {
        for waiting := true; waiting; {
                time.Sleep(time.Second)
                if boot.ctx.Err() != nil {
-                       return false
+                       return nil, false
                }
                if boot.healthChecker == nil {
                        // not set up yet
@@ -329,7 +329,8 @@ func (boot *Booter) WaitReady() bool {
                        }
                }
        }
-       return true
+       u := boot.cluster.Services.Controller.ExternalURL
+       return &u, true
 }
 
 func (boot *Booter) prependEnv(key, prepend string) {