Skip to content

Commit 92fb330

Browse files
committed
don't fail immediately on transient error in get process detail loop
1 parent 2440bc4 commit 92fb330

File tree

12 files changed

+35
-24
lines changed

12 files changed

+35
-24
lines changed

src/cmd/projectDelete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func projectDeleteCmd() *cmdBuilder.Cmd {
7676
ctx,
7777
cmdData.UxBlocks,
7878
[]uxHelpers.Process{{
79-
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
79+
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient, cmdData.UxBlocks),
8080
RunningMessage: i18n.T(i18n.ProjectDeleting),
8181
ErrorMessageMessage: i18n.T(i18n.ProjectDeleteFailed),
8282
SuccessMessage: i18n.T(i18n.ProjectDeleted),

src/cmd/projectImport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func projectImportCmd() *cmdBuilder.Cmd {
7171
for _, service := range responseOutput.ServiceStacks {
7272
for _, process := range service.Processes {
7373
processes = append(processes, uxHelpers.Process{
74-
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient),
74+
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient, cmdData.UxBlocks),
7575
RunningMessage: service.Name.String() + ": " + process.ActionName.String(),
7676
ErrorMessageMessage: service.Name.String() + ": " + process.ActionName.String(),
7777
SuccessMessage: service.Name.String() + ": " + process.ActionName.String(),

src/cmd/projectServiceImport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func projectServiceImportCmd() *cmdBuilder.Cmd {
6666
for _, service := range responseOutput.ServiceStacks {
6767
for _, process := range service.Processes {
6868
processes = append(processes, uxHelpers.Process{
69-
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient),
69+
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient, cmdData.UxBlocks),
7070
RunningMessage: service.Name.String() + ": " + process.ActionName.String(),
7171
ErrorMessageMessage: service.Name.String() + ": " + process.ActionName.String(),
7272
SuccessMessage: service.Name.String() + ": " + process.ActionName.String(),

src/cmd/serviceCreate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func serviceCreateCmd() *cmdBuilder.Cmd {
188188
cmdData.UxBlocks,
189189
[]uxHelpers.Process{
190190
{
191-
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient),
191+
F: uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient, cmdData.UxBlocks),
192192
RunningMessage: "Creating service",
193193
ErrorMessageMessage: "Service creation failed",
194194
SuccessMessage: "Service created",

src/cmd/serviceDelete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func serviceDeleteCmd() *cmdBuilder.Cmd {
7575
ctx,
7676
cmdData.UxBlocks,
7777
[]uxHelpers.Process{{
78-
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
78+
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient, cmdData.UxBlocks),
7979
RunningMessage: i18n.T(i18n.ServiceDeleting),
8080
ErrorMessageMessage: i18n.T(i18n.ServiceDeleteFailed),
8181
SuccessMessage: i18n.T(i18n.ServiceDeleted),

src/cmd/serviceDeploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func serviceDeployCmd() *cmdBuilder.Cmd {
201201
ctx,
202202
cmdData.UxBlocks,
203203
[]uxHelpers.Process{{
204-
F: uxHelpers.CheckZeropsProcess(deployProcess.Id, cmdData.RestApiClient),
204+
F: uxHelpers.CheckZeropsProcess(deployProcess.Id, cmdData.RestApiClient, cmdData.UxBlocks),
205205
RunningMessage: i18n.T(i18n.DeployRunning),
206206
ErrorMessageMessage: i18n.T(i18n.DeployFailed),
207207
SuccessMessage: i18n.T(i18n.DeployFinished),

src/cmd/serviceEnableSubdomain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func serviceEnableSubdomainCmd() *cmdBuilder.Cmd {
4444
ctx,
4545
cmdData.UxBlocks,
4646
[]uxHelpers.Process{{
47-
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
47+
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient, cmdData.UxBlocks),
4848
RunningMessage: i18n.T(i18n.ServiceEnablingSubdomain),
4949
ErrorMessageMessage: i18n.T(i18n.ServiceEnableSubdomainFailed),
5050
SuccessMessage: i18n.T(i18n.ServiceEnabledSubdomain),

src/cmd/servicePush.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func servicePushCmd() *cmdBuilder.Cmd {
213213
cmdData.UxBlocks,
214214
[]uxHelpers.Process{
215215
{
216-
F: uxHelpers.CheckZeropsProcess(deployProcess.Id, cmdData.RestApiClient,
216+
F: uxHelpers.CheckZeropsProcess(deployProcess.Id, cmdData.RestApiClient, cmdData.UxBlocks,
217217
uxHelpers.CheckZeropsProcessWithProcessOutputCallback(
218218
func(ctx context.Context, process *uxHelpers.Process, apiProcess output.Process) error {
219219
if cmdData.Params.GetBool("disable-logs") {

src/cmd/serviceStart.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func serviceStartCmd() *cmdBuilder.Cmd {
4343
ctx,
4444
cmdData.UxBlocks,
4545
[]uxHelpers.Process{{
46-
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
46+
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient, cmdData.UxBlocks),
4747
RunningMessage: i18n.T(i18n.ServiceStarting),
4848
ErrorMessageMessage: i18n.T(i18n.ServiceStartFailed),
4949
SuccessMessage: i18n.T(i18n.ServiceStarted),

src/cmd/serviceStop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func serviceStopCmd() *cmdBuilder.Cmd {
4444
ctx,
4545
cmdData.UxBlocks,
4646
[]uxHelpers.Process{{
47-
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
47+
F: uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient, cmdData.UxBlocks),
4848
RunningMessage: i18n.T(i18n.ServiceStopping),
4949
ErrorMessageMessage: i18n.T(i18n.ServiceStopFailed),
5050
SuccessMessage: i18n.T(i18n.ServiceStopped),

0 commit comments

Comments
 (0)