SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "[chore] Tidy up federating db locks a tiny bit (#472)" (#479) 

This reverts commit 31c1067a54.
This commit is contained in:
tobi 2022-04-24 11:56:06 +02:00 committed by GitHub
parent 4bace80fab
commit 8d34d5af3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/federation/federatingdb/lock.go
View File

@ -52,7 +52,6 @@ func (f *federatingDB) Lock(c context.Context, id *url.URL) error {
// Acquire map lock // Acquire map lock
f.mutex.Lock() f.mutex.Lock()
defer f.mutex.Unlock()
// Get mutex, or create new // Get mutex, or create new
mu, ok := f.locks[idStr] mu, ok := f.locks[idStr]
@ -64,7 +63,8 @@ func (f *federatingDB) Lock(c context.Context, id *url.URL) error {
f.locks[idStr] = mu f.locks[idStr] = mu
} }
// Lock the mutex // Unlock map, acquire mutex lock
f.mutex.Unlock()
mu.Lock() mu.Lock()
return nil return nil
} }
@ -81,13 +81,13 @@ func (f *federatingDB) Unlock(c context.Context, id *url.URL) error {
} }
idStr := id.String() idStr := id.String()
// Acquire map lock // Check map for mutex
f.mutex.Lock() f.mutex.Lock()
defer f.mutex.Unlock()
mu, ok := f.locks[idStr] mu, ok := f.locks[idStr]
f.mutex.Unlock()
if !ok { if !ok {
return errors.New("Unlock: missing an id in unlock") return errors.New("missing an id in unlock")
} }
// Unlock the mutex // Unlock the mutex