mastofe

commit: a9c0062e80f2d29ece1830967a0ccbefc4698e1b
parent: dbd529109ea95df43aefa514c312d7397e7fc713
Author: Eugen <eugen@zeonfederated.com>
Date:   Thu,  6 Apr 2017 02:35:34 +0200

Merge pull request #1013 from blackle/master

Catch more errors in process_follows so it doesn't fail
Diffstat:
M
app/workers/import_worker.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
@@ -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