call Monitor after ComposeUp

Author: jordanstephens

src/cmd/cli/command/compose.go

@@ -162,15 +162,8 @@ func makeComposeUpCmd() *cobra.Command {
 				return nil
 			}
 
-			// show users the current streaming logs
-			tailSource := "all services"
-			if deploy.Etag != "" {
-				tailSource = "deployment ID " + deploy.Etag
-			}
-			term.Info("Tailing logs for", tailSource, "; press Ctrl+C to detach:")
-
-			tailOptions := newTailOptionsForDeploy(deploy.Etag, since, global.Verbose)
-			serviceStates, err := cli.TailAndMonitor(ctx, project, provider, time.Duration(waitTimeout)*time.Second, tailOptions)
+			term.Info("Live tail logs with `defang tail --deployment=" + deploy.Etag + "`")
+			serviceStates, err := cli.Monitor(ctx, project, provider, time.Duration(waitTimeout)*time.Second, deploy.Etag)
 			if err != nil {
 				deploymentErr := err
 				debugger, err := debug.NewDebugger(ctx, global.Cluster, &global.Stack)

src/pkg/cli/tailAndMonitor.go

@@ -31,7 +31,7 @@ func Monitor(ctx context.Context, project *compose.Project, provider client.Prov
 	_, computeServices := splitManagedAndUnmanagedServices(project.Services)
 
 	for _, svc := range computeServices {
-		term.Infof("%s [%s] %s\n", time.Now().Format(time.TimeOnly), svc, "PENDING")
+		term.Infof("[%s] %s\n", svc, "DEPLOYMENT_PENDING")
 	}
 
 	var (
@@ -46,7 +46,7 @@ func Monitor(ctx context.Context, project *compose.Project, provider client.Prov
 		serviceStates, svcErr = WatchServiceState(svcStatusCtx, provider, project.Name, deploymentID, computeServices, func(msg *defangv1.SubscribeResponse, states *ServiceStates) error {
 			// Print service status updates as they arrive
 			for name, state := range *states {
-				term.Infof("%s [%s] %s\n", time.Now().Format(time.TimeOnly), name, state.String())
+				term.Infof("[%s] %s\n", name, state.String())
 			}
 			return nil
 		})