mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 20:32:56 +00:00
Fix Move handler not being triggered when failing to fetch target (#15107)
When failing to fetch the target account, the ProcessingWorker fails as expected, but since it hasn't cleared the `move_in_progress` flag, the next attempt at processing skips the `Move` activity altogether. This commit changes it to clear the flag when encountering any unexpected error on fetching the target account. This is likely to occur because, of, e.g., a timeout, when many instances query the same actor at the same time.
This commit is contained in:
parent
cc98f967b1
commit
b0893291ef
|
@ -20,6 +20,9 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
|
||||||
|
|
||||||
# Initiate a re-follow for each follower
|
# Initiate a re-follow for each follower
|
||||||
MoveWorker.perform_async(origin_account.id, target_account.id)
|
MoveWorker.perform_async(origin_account.id, target_account.id)
|
||||||
|
rescue
|
||||||
|
unmark_as_processing!
|
||||||
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
Loading…
Reference in a new issue