From 90d4bb8125e80c8060416d4d135ddeaf0a622ede Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 13 Jun 2018 14:27:40 +0200 Subject: Refractor retry transaction function --- server/lib/activitypub/process/process-follow.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'server/lib/activitypub/process/process-follow.ts') diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts index dc1d542b5..f34fd66cc 100644 --- a/server/lib/activitypub/process/process-follow.ts +++ b/server/lib/activitypub/process/process-follow.ts @@ -11,7 +11,7 @@ async function processFollowActivity (activity: ActivityFollow) { const activityObject = activity.object const actor = await getOrCreateActorAndServerAndModel(activity.actor) - return processFollow(actor, activityObject) + return retryTransactionWrapper(processFollow, actor, activityObject) } // --------------------------------------------------------------------------- @@ -22,16 +22,7 @@ export { // --------------------------------------------------------------------------- -function processFollow (actor: ActorModel, targetActorURL: string) { - const options = { - arguments: [ actor, targetActorURL ], - errorMessage: 'Cannot follow with many retries.' - } - - return retryTransactionWrapper(follow, options) -} - -async function follow (actor: ActorModel, targetActorURL: string) { +async function processFollow (actor: ActorModel, targetActorURL: string) { await sequelizeTypescript.transaction(async t => { const targetActor = await ActorModel.loadByUrl(targetActorURL, t) -- cgit v1.2.3