Merge pull request #5690 from Aman-Cool/fix/resume-success-after-failure

stefanprodan · web-flow · commit a4903a95bebe · 2026-01-25T10:29:02.000+02:00
Fix resume command logging success after reconciliation failure
diff --git a/cmd/flux/resume.go b/cmd/flux/resume.go
@@ -251,7 +251,8 @@ func (resume resumeCommand) printMessage(responses []reconcileResponse) {
 			continue
 		}
 		if r.err != nil {
-			logger.Failuref("%s", r.err.Error())
+			logger.Failuref("%s %s reconciliation failed: %s", resume.kind, r.asClientObject().GetName(), r.err.Error())
+			continue
 		}
 		logger.Successf("%s %s reconciliation completed", resume.kind, r.asClientObject().GetName())
 		logger.Successf("%s", r.successMessage())

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,8 @@ func (resume resumeCommand) printMessage(responses []reconcileResponse) {`
`251`	`251`	`continue`
`252`	`252`	`}`
`253`	`253`	`if r.err != nil {`
`254`		`- logger.Failuref("%s", r.err.Error())`
	`254`	`+ logger.Failuref("%s %s reconciliation failed: %s", resume.kind, r.asClientObject().GetName(), r.err.Error())`
	`255`	`+ continue`
`255`	`256`	`}`
`256`	`257`	`logger.Successf("%s %s reconciliation completed", resume.kind, r.asClientObject().GetName())`
`257`	`258`	`logger.Successf("%s", r.successMessage())`