diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-11-14 15:57:25 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-11-14 15:57:25 +0100 |
| commit | 4ee436e98a3351d9568c4a018bd2de34c218e9a6 (patch) | |
| tree | 4b919150266fb327805f78663e9e705179598a7b /internal/federation | |
| parent | [bugfix] Update poll delete/update db queries (#2361) (diff) | |
| download | gotosocial-4ee436e98a3351d9568c4a018bd2de34c218e9a6.tar.xz | |
[bugfix] process account delete side effects in serial, not in parallel (#2360)
* [bugfix] process account delete side effects in serial, not in parallel
* StartWorkers / StartNoopWorkers for tests
* undo testrig trace logging
* log errors instead of immediately returning
Diffstat (limited to 'internal/federation')
| -rw-r--r-- | internal/federation/dereferencing/account.go | 8 | ||||
| -rw-r--r-- | internal/federation/dereferencing/dereferencer_test.go | 2 | ||||
| -rw-r--r-- | internal/federation/federatingdb/federatingdb_test.go | 2 | ||||
| -rw-r--r-- | internal/federation/federator_test.go | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index d551c3f0b..19d53895a 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -317,11 +317,9 @@ func (d *Dereferencer) RefreshAccountAsync(ctx context.Context, requestUser stri if apubAcc != nil { // This account was updated, enqueue re-dereference featured posts. - d.state.Workers.Federator.MustEnqueueCtx(ctx, func(ctx context.Context) { - if err := d.dereferenceAccountFeatured(ctx, requestUser, latest); err != nil { - log.Errorf(ctx, "error fetching account featured collection: %v", err) - } - }) + if err := d.dereferenceAccountFeatured(ctx, requestUser, latest); err != nil { + log.Errorf(ctx, "error fetching account featured collection: %v", err) + } } }) } diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go index 1fefc1db9..517479a50 100644 --- a/internal/federation/dereferencing/dereferencer_test.go +++ b/internal/federation/dereferencing/dereferencer_test.go @@ -60,7 +60,7 @@ func (suite *DereferencerStandardTestSuite) SetupTest() { suite.testEmojis = testrig.NewTestEmojis() suite.state.Caches.Init() - testrig.StartWorkers(&suite.state) + testrig.StartNoopWorkers(&suite.state) suite.db = testrig.NewTestDB(&suite.state) diff --git a/internal/federation/federatingdb/federatingdb_test.go b/internal/federation/federatingdb/federatingdb_test.go index 5c1428ee1..54c724057 100644 --- a/internal/federation/federatingdb/federatingdb_test.go +++ b/internal/federation/federatingdb/federatingdb_test.go @@ -67,7 +67,7 @@ func (suite *FederatingDBTestSuite) SetupTest() { testrig.InitTestLog() suite.state.Caches.Init() - testrig.StartWorkers(&suite.state) + testrig.StartNoopWorkers(&suite.state) suite.fromFederator = make(chan messages.FromFediAPI, 10) suite.state.Workers.EnqueueFediAPI = func(ctx context.Context, msgs ...messages.FromFediAPI) { diff --git a/internal/federation/federator_test.go b/internal/federation/federator_test.go index bfc25fc74..172675bd2 100644 --- a/internal/federation/federator_test.go +++ b/internal/federation/federator_test.go @@ -56,7 +56,7 @@ func (suite *FederatorStandardTestSuite) SetupSuite() { func (suite *FederatorStandardTestSuite) SetupTest() { suite.state.Caches.Init() - testrig.StartWorkers(&suite.state) + testrig.StartNoopWorkers(&suite.state) testrig.InitTestConfig() testrig.InitTestLog() |