Merge pull request #1013 from blackle/master

Catch more errors in process_follows so it doesn't fail
feature-private-federation
Eugen 2017-04-06 02:35:34 +02:00 committed by GitHub
commit a9c0062e80
1 changed files with 1 additions and 1 deletions

View File

@ -46,7 +46,7 @@ class ImportWorker
begin begin
FollowService.new.call(from_account, row[0]) FollowService.new.call(from_account, row[0])
rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
next next
end end
end end