diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-06-09 17:26:58 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-09 10:26:58 +0200 |
commit | d890abfcab076f5df4eafb75397435d32c641e20 (patch) | |
tree | b492373b83e02f46f41259826433163d42f6936c /app/workers | |
parent | 72a7cfaa395bbddabd0f0a712165fd7babf5d58c (diff) |
Fix performance of follow import (#13836)
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/import/relationship_worker.rb | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb index 616da6da9..4a455f3ae 100644 --- a/app/workers/import/relationship_worker.rb +++ b/app/workers/import/relationship_worker.rb @@ -7,7 +7,8 @@ class Import::RelationshipWorker def perform(account_id, target_account_uri, relationship, options = {}) from_account = Account.find(account_id) - target_account = ResolveAccountService.new.call(target_account_uri) + target_domain = domain(target_account_uri) + target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) } options.symbolize_keys! return if target_account.nil? @@ -29,4 +30,22 @@ class Import::RelationshipWorker rescue ActiveRecord::RecordNotFound true end + + def domain(uri) + domain = uri.is_a?(Account) ? uri.domain : uri.split('@')[1] + TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain) + end + + def stoplight_wrap_request(domain, &block) + if domain.present? + Stoplight("source:#{domain}", &block) + .with_fallback { nil } + .with_threshold(1) + .with_cool_off_time(5.minutes.seconds) + .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) } + .run + else + block.call + end + end end |