diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 20:57:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 20:57:52 +0200 |
| commit | abb11778d7d9ac04fe1feeccf5cefc6d2ed58780 (patch) | |
| tree | 8625ac220f65abbf56f680012dcbb87551038ee6 /app/services/remove_status_service.rb | |
| parent | 62c6e12fa58adea57954e395d10d0ffc2c0cd73c (diff) | |
Fix inconsistency in error handling when removing a status (#17974)
Not completely sure this could actually have any ill effect, but if `RemoveStatusService` fails to acquire a lock in an `ActivityPub::ProcessingWorker` job processing a `Delete`, the status is currently discarded and causes a job failure but the next time the job is attempted, it will skip deleting the status due to it being discarded. This commit makes the behavior of `RemoveStatusService` a bit more consistent in case of failure to acquire the lock.
Diffstat (limited to 'app/services/remove_status_service.rb')
| -rw-r--r-- | app/services/remove_status_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 159aec1f2..41730154d 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -17,10 +17,10 @@ class RemoveStatusService < BaseService @account = status.account @options = options - @status.discard - RedisLock.acquire(lock_options) do |lock| if lock.acquired? + @status.discard + remove_from_self if @account.local? remove_from_followers remove_from_lists |