diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-16 15:42:00 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-01-16 15:42:00 +0100 |
| commit | a4f07bad9529a6bebb6a0292c4ef0bfc6e29c4d2 (patch) | |
| tree | 51b2b84810af1e1ae98b9b21586e4619c9a8f103 /app/lib/activitypub/activity/delete.rb | |
| parent | 5363c724fc33e441cd4be22ba0e757b1ac4fd401 (diff) | |
Reduce chances of race conditions when processing deleted toots (#9815)
* Reduce chances of race conditions when processing deleted toots * Prevent race condition when processing deleted toots
Diffstat (limited to 'app/lib/activitypub/activity/delete.rb')
| -rw-r--r-- | app/lib/activitypub/activity/delete.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 8270fed1b..ca3cf387e 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -21,11 +21,13 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def delete_note return if object_uri.nil? + RedisLock.acquire(lock_options) do |_lock| + delete_later!(object_uri) + end + @status = Status.find_by(uri: object_uri, account: @account) @status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present? - delete_later!(object_uri) - return if @status.nil? if @status.public_visibility? || @status.unlisted_visibility? @@ -68,4 +70,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def payload @payload ||= Oj.dump(@json) end + + def lock_options + { redis: Redis.current, key: "create:#{object_uri}" } + end end |