From 561ad71e58189d1daea28ec50cc9d4bac82dcfec Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 13 Feb 2023 21:19:51 +0100 Subject: [bugfix] Fix up `error getting account avatar/header` errors, other small fixes (#1496) * start fiddling with media + account queries a little * initialize state when pruning * allow for unsetting remote media make sure to wait til media loaded fix silly tiny bug * move comment a bit for readability * slight reformat of fetchRemoteAccount{Avatar,Header} * fix issue after rebase * slightly neaten up logic of avatar/header media handling * remove log prefix (callername log field handles this) --------- Signed-off-by: kim Co-authored-by: kim --- cmd/gotosocial/action/admin/media/prune/common.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmd') diff --git a/cmd/gotosocial/action/admin/media/prune/common.go b/cmd/gotosocial/action/admin/media/prune/common.go index bd759a0d4..d21412a68 100644 --- a/cmd/gotosocial/action/admin/media/prune/common.go +++ b/cmd/gotosocial/action/admin/media/prune/common.go @@ -33,6 +33,7 @@ type prune struct { dbService db.DB storage *gtsstorage.Driver manager media.Manager + state *state.State } func setupPrune(ctx context.Context) (*prune, error) { @@ -44,6 +45,7 @@ func setupPrune(ctx context.Context) (*prune, error) { if err != nil { return nil, fmt.Errorf("error creating dbservice: %w", err) } + state.DB = dbService //nolint:contextcheck storage, err := gtsstorage.AutoConfig() @@ -61,6 +63,7 @@ func setupPrune(ctx context.Context) (*prune, error) { dbService: dbService, storage: storage, manager: manager, + state: &state, }, nil } @@ -73,5 +76,8 @@ func (p *prune) shutdown(ctx context.Context) error { return fmt.Errorf("error closing dbservice: %w", err) } + p.state.Caches.Stop() + p.state.Workers.Stop() + return nil } -- cgit v1.3