Skip to content

Take control over your live stream video by running it yourself. Streaming + chat out of the box.

fix(ap): lock db and return error in createFollow

Gabe Kangas10364bb8e1bc
diff --git a/activitypub/persistence/followersrepository/followersrepository.go b/activitypub/persistence/followersrepository/followersrepository.go
index 0e6a202299..d72019795a 100644
--- a/activitypub/persistence/followersrepository/followersrepository.go
+++ b/activitypub/persistence/followersrepository/followersrepository.go
@@ -313,6 +313,9 @@ func (r *SqlFollowersRepository) Update(actorIRI string, inbox string, sharedInb
}
func (r *SqlFollowersRepository) createFollow(actor, inbox, sharedInbox, request, name, username, image string, requestObject []byte, approved bool) error {
+ r.datastore.DbLock.Lock()
+ defer r.datastore.DbLock.Unlock()
+
tx, err := r.datastore.DB.Begin()
if err != nil {
return errors.Wrap(err, "error beginning transaction")
@@ -340,7 +343,7 @@ func (r *SqlFollowersRepository) createFollow(actor, inbox, sharedInbox, request
Request: request,
RequestObject: requestObject,
}); err != nil {
- log.Errorln("error creating new federation follow: ", err)
+ return errors.Wrap(err, "error creating new federation follow")
}
return tx.Commit()