Merge pull request mastodon#1013 from blackle/master

Catch more errors in process_follows so it doesn't fail
vmincev · Apr 6, 2017 · a9c0062 · a9c0062
2 parents dbd5291 + 540d6ef
commit a9c0062
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
@@ -46,7 +46,7 @@ def process_follows(import)
 
       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