diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go index e28c90de..d7772161 100644 --- a/pkg/upstream/stack/stack.go +++ b/pkg/upstream/stack/stack.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "os" "os/signal" - "strings" "time" "coopcloud.tech/abra/pkg/upstream/convert" @@ -416,7 +415,7 @@ func deployServices( return nil } - logrus.Infof("Starting to poll for deployment status for: %s", strings.Join(serviceNames, ", ")) + logrus.Infof("Starting to poll for deployment status for: %s", appName) ch := make(chan error, len(serviceIDs)) for serviceID, serviceName := range serviceIDs { logrus.Debugf("waiting on %s to converge", serviceName) @@ -433,7 +432,7 @@ func deployServices( logrus.Debugf("assuming %s converged successfully", serviceID) } - logrus.Infof("Successfully deployed %s to %s 👌", appName, namespace.Name()) + logrus.Infof("Successfully deployed %s", appName) return nil } @@ -473,24 +472,12 @@ func WaitOnService(ctx context.Context, cl *dockerClient.Client, serviceID, appN return err case <-sigintChannel: return fmt.Errorf(fmt.Sprintf(` -The wait for %s to converge was interrupted. +Cancelling polling for %s, deployment is still continuing. -This does not necessarily mean your deployment has stopped, but we aren't -monitoring it anymore +If you want to stop the deployment try: + abra app undeploy %s -You can track latest deployment status with: - - abra app ps --watch %s - -And inspect the logs with: - - abra app logs %s - -If a service is failing to even start, try to smoke out the error with: - - abra app errors --watch %s - -`, appName, appName, appName, appName)) +`, appName, appName)) case <-time.After(timeout): return fmt.Errorf(fmt.Sprintf(` %s has not converged (%s second timeout reached).