amadan

carlos / platform Public

registry: propagate RowsAffected's error in PruneTimers/DeleteTimersExcept

Both discarded the error from res.RowsAffected() (n, _ := ...), unlike
every other RowsAffected call in this package (registry.go, fleets.go
all check it). Propagate it the same way — return 0, err.
Paul Campbell pushed by paul@keymail.dev b986e59f10436e807ef9d863de10dc51cb145bd8 parent a213774
1 file changed, +8 −2
  • internal/registry/timers.go +8 −2
diff --git a/internal/registry/timers.go b/internal/registry/timers.go
index f8293daa7..ce4b22dc8 100644
--- a/internal/registry/timers.go
+++ b/internal/registry/timers.go
@@ -158,7 +158,10 @@ func (r *Registry) PruneTimers(alive map[string]bool, doneBefore int64) (int, er
if err != nil {
return 0, err
}
- n, _ := res.RowsAffected()
+ n, err := res.RowsAffected()
+ if err != nil {
+ return 0, err
+ }
return int(n), nil
}
@@ -177,6 +180,9 @@ func (r *Registry) DeleteTimersExcept(host, kind string, keep map[string]bool) (
if err != nil {
return 0, err
}
- n, _ := res.RowsAffected()
+ n, err := res.RowsAffected()
+ if err != nil {
+ return 0, err
+ }
return int(n), nil
}