enter: start default services before executing subcommand

internals/cli/cmd_run.go

@@ -194,6 +194,15 @@ func runDaemon(rcmd *cmdRun, ch chan os.Signal, ready chan<- func()) error {
 
 	logger.Debugf("activation done in %v", time.Now().Truncate(time.Millisecond).Sub(t0))
 
+	var autoStartReady chan struct{}
+	var stop chan struct{}
+
+	notifyReady := func() {
+		stop = make(chan struct{}, 1)
+		ready <- func() { close(stop) }
+		close(ready)
+	}
+
 	if !rcmd.Hold {
 		servopts := client.ServiceOptions{}
 		changeID, err := rcmd.client.AutoStart(&servopts)
@@ -202,13 +211,24 @@ func runDaemon(rcmd *cmdRun, ch chan os.Signal, ready chan<- func()) error {
 		} else {
 			logger.Noticef("Started default services with change %s.", changeID)
 		}
-	}
 
-	var stop chan struct{}
-	if ready != nil {
-		stop = make(chan struct{}, 1)
-		ready <- func() { close(stop) }
-		close(ready)
+		if ready != nil {
+			// wait for the default services to start
+			autoStartReady = make(chan struct{}, 1)
+			go func() {
+				waitCmd := waitMixin{
+					hideProgress: true,
+				}
+				waitCmd.setClient(rcmd.client)
+				_, err := waitCmd.wait(changeID)
+				if err != nil {
+					logger.Debugf("Error starting default services: %v", err)
+				}
+				autoStartReady <- struct{}{}
+			}()
+		}
+	} else if ready != nil {
+		notifyReady()
 	}
 
 out:
@@ -226,6 +246,8 @@ out:
 				d.SetDegradedMode(nil)
 				tic.Stop()
 			}
+		case <-autoStartReady:
+			notifyReady()
 		case <-stop:
 			break out
 		}

internals/cli/wait.go

@@ -32,8 +32,9 @@ var (
 
 type waitMixin struct {
 	clientMixin
-	NoWait    bool `long:"no-wait"`
-	skipAbort bool
+	NoWait       bool `long:"no-wait"`
+	skipAbort    bool
+	hideProgress bool
 }
 
 var waitDescs = map[string]string{
@@ -64,7 +65,12 @@ func (wmx waitMixin) wait(id string) (*client.Change, error) {
 		}
 	}()
 
-	pb := progress.MakeProgressBar()
+	var pb progress.Meter
+	if wmx.hideProgress {
+		pb = progress.NullMeter{}
+	} else {
+		pb = progress.MakeProgressBar()
+	}
 	defer func() {
 		pb.Finished()
 		// Next two are not strictly needed for CLI, but