about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-06 02:35:34 +0200
committerGitHub <noreply@github.com>2017-04-06 02:35:34 +0200
commita9c0062e80f2d29ece1830967a0ccbefc4698e1b (patch)
tree7f2e729d3e2b3a957b2d86e9d2dbc8898fb344de /app
parentdbd529109ea95df43aefa514c312d7397e7fc713 (diff)
parent540d6efe88717b0da4a23b5069a3caaff5b3241a (diff)
Merge pull request #1013 from blackle/master
Catch more errors in process_follows so it doesn't fail
Diffstat (limited to 'app')
-rw-r--r--app/workers/import_worker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index 7cf29fb53..d5a33cada 100644
--- 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