Fix media redownload worker retrying on unexpected response codes (#16111)

This commit is contained in:
Eugen Rochko 2021-05-05 23:46:59 +02:00 committed by GitHub
parent aa1b43f467
commit 6d9ad30bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View File

@ -3,6 +3,7 @@
class RedownloadMediaWorker class RedownloadMediaWorker
include Sidekiq::Worker include Sidekiq::Worker
include ExponentialBackoff include ExponentialBackoff
include JsonLdHelper
sidekiq_options queue: 'pull', retry: 3 sidekiq_options queue: 'pull', retry: 3
@ -15,6 +16,14 @@ class RedownloadMediaWorker
media_attachment.download_thumbnail! media_attachment.download_thumbnail!
media_attachment.save media_attachment.save
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
true # Do nothing
rescue Mastodon::UnexpectedResponseError => e
response = e.response
if response_error_unsalvageable?(response)
# Give up
else
raise e
end
end end
end end

View File

@ -12,7 +12,11 @@ module Mastodon
class RateLimitExceededError < Error; end class RateLimitExceededError < Error; end
class UnexpectedResponseError < Error class UnexpectedResponseError < Error
attr_reader :response
def initialize(response = nil) def initialize(response = nil)
@response = response
if response.respond_to? :uri if response.respond_to? :uri
super("#{response.uri} returned code #{response.code}") super("#{response.uri} returned code #{response.code}")
else else