summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-08-02 17:21:46 +0200
committerLibravatar GitHub <noreply@github.com>2023-08-02 17:21:46 +0200
commite8a20f587c0b0129bc68f5c6092c54f2b4c3519a (patch)
tree3677b4abec2cabf3b5042115ba76505daf5fddf3 /cmd
parent[bugfix] fix slow accounts / statuses using emojis lookups (#2056) (diff)
downloadgotosocial-e8a20f587c0b0129bc68f5c6092c54f2b4c3519a.tar.xz
[bugfix] Rework MultiError to wrap + unwrap errors properly (#2057)
* rework multierror a bit * test multierror
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gotosocial/action/admin/media/prune/common.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/gotosocial/action/admin/media/prune/common.go b/cmd/gotosocial/action/admin/media/prune/common.go
index 0db1a3462..ad721675e 100644
--- a/cmd/gotosocial/action/admin/media/prune/common.go
+++ b/cmd/gotosocial/action/admin/media/prune/common.go
@@ -75,14 +75,14 @@ func setupPrune(ctx context.Context) (*prune, error) {
}
func (p *prune) shutdown(ctx context.Context) error {
- var errs gtserror.MultiError
+ errs := gtserror.NewMultiError(2)
if err := p.storage.Close(); err != nil {
- errs.Appendf("error closing storage backend: %v", err)
+ errs.Appendf("error closing storage backend: %w", err)
}
if err := p.dbService.Stop(ctx); err != nil {
- errs.Appendf("error stopping database: %v", err)
+ errs.Appendf("error stopping database: %w", err)
}
p.state.Workers.Stop()