Handle StaleObjectError when retrieving polls (mastodon#10208)

Origin-Creative · Mar 7, 2019 · 9f079c2 · 9f079c2
1 parent 9a32458
commit 9f079c2
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/services/activitypub/fetch_remote_poll_service.rb b/app/services/activitypub/fetch_remote_poll_service.rb
@@ -32,12 +32,17 @@ def call(poll, on_behalf_of = nil)
  # votes, so we need to remove them
  poll.votes.delete_all if latest_options != poll.options
 
- poll.update!(
- last_fetched_at: Time.now.utc,
- expires_at: expires_at,
- options: latest_options,
- cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
- )
+ begin
+ poll.update!(
+ last_fetched_at: Time.now.utc,
+ expires_at: expires_at,
+ options: latest_options,
+ cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
+ )
+ rescue ActiveRecord::StaleObjectError
+ poll.reload
+ retry
+ end
  end
 
  private