Further changes to messages.
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Rich M 2023-08-04 19:05:49 +01:00
parent ae1a6c45f9
commit f5cadcc5f0
1 changed files with 6 additions and 19 deletions

View File

@ -7,7 +7,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/signal" "os/signal"
"strings"
"time" "time"
"coopcloud.tech/abra/pkg/upstream/convert" "coopcloud.tech/abra/pkg/upstream/convert"
@ -416,7 +415,7 @@ func deployServices(
return nil 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)) ch := make(chan error, len(serviceIDs))
for serviceID, serviceName := range serviceIDs { for serviceID, serviceName := range serviceIDs {
logrus.Debugf("waiting on %s to converge", serviceName) logrus.Debugf("waiting on %s to converge", serviceName)
@ -433,7 +432,7 @@ func deployServices(
logrus.Debugf("assuming %s converged successfully", serviceID) 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 return nil
} }
@ -473,24 +472,12 @@ func WaitOnService(ctx context.Context, cl *dockerClient.Client, serviceID, appN
return err return err
case <-sigintChannel: case <-sigintChannel:
return fmt.Errorf(fmt.Sprintf(` 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 If you want to stop the deployment try:
monitoring it anymore abra app undeploy %s
You can track latest deployment status with: `, appName, appName))
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))
case <-time.After(timeout): case <-time.After(timeout):
return fmt.Errorf(fmt.Sprintf(` return fmt.Errorf(fmt.Sprintf(`
%s has not converged (%s second timeout reached). %s has not converged (%s second timeout reached).