luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-31 17:46:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1013 from blackle/master

Browse source 
Catch more errors in process_follows so it doesn't fail
This commit is contained in:
Eugen 2017-04-06 02:35:34 +02:00 committed by GitHub
parent dbd529109e 540d6efe88
commit a9c0062e80
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/workers/import_worker.rb
View file

@ -46,7 +46,7 @@ class ImportWorker
begin
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
end
end