From e8a20f587c0b0129bc68f5c6092c54f2b4c3519a Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 2 Aug 2023 17:21:46 +0200
Subject: [bugfix] Rework MultiError to wrap + unwrap errors properly (#2057)

* rework multierror a bit

* test multierror
---
 cmd/gotosocial/action/admin/media/prune/common.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd')

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()
-- 
cgit v1.3