Merge pull request #89 from fly-apps/return-err

davissp14 · web-flow · commit 5c02454406d3 · 2023-02-13T08:50:28.000-06:00
Ensure error is returned if primary unregistration fails
diff --git a/internal/flypg/repmgr.go b/internal/flypg/repmgr.go
@@ -172,7 +172,7 @@ func (r *RepMgr) registerPrimary() error {
 func (r *RepMgr) unregisterPrimary(id int) error {
 	cmdStr := fmt.Sprintf("repmgr primary unregister -f %s --node-id=%d", r.ConfigPath, id)
 	if err := utils.RunCommand(cmdStr); err != nil {
-		fmt.Printf("failed to unregister primary: %s", err)
+		return err
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func (r *RepMgr) registerPrimary() error {`
`172`	`172`	`func (r *RepMgr) unregisterPrimary(id int) error {`
`173`	`173`	`cmdStr := fmt.Sprintf("repmgr primary unregister -f %s --node-id=%d", r.ConfigPath, id)`
`174`	`174`	`if err := utils.RunCommand(cmdStr); err != nil {`
`175`		`- fmt.Printf("failed to unregister primary: %s", err)`
	`175`	`+ return err`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`return nil`