Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix webfinger retries (#4275)

Browse source 
* Do not raise unretryable exceptions in ResolveRemoteAccountService

* Removed fatal exceptions from ResolveRemoteAccountService

Exceptions that cannot be retried should not be raised. New exception
class for those that can be retried (Mastodon::UnexpectedResponseError)
This commit is contained in:
Eugen Rochko 2017-07-20 01:59:07 +02:00 • committed by GitHub
parent f24b81e27f
commit 1fcdaafa6f
14 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/workers/import_worker.rb
View file

@ -44,7 +44,7 @@ class ImportWorker
target_account = ResolveRemoteAccountService.new.call(row.first)
next if target_account.nil?
MuteService.new.call(from_account, target_account)
rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
next
end
end
@ -56,7 +56,7 @@ class ImportWorker
target_account = ResolveRemoteAccountService.new.call(row.first)
next if target_account.nil?
BlockService.new.call(from_account, target_account)
rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
next
end
end
@ -66,7 +66,7 @@ class ImportWorker
import_rows.each do |row|
begin
FollowService.new.call(from_account, row.first)
rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
next
end
end