aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-09-10 11:54:10 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-09-10 11:54:10 +0300
commit148bc244359e70c87ec2812c65da83fe87efbc68 (patch)
tree3ef4d3deb18732ffd523a03161c48ee9f6861fcc
parentb4860c57a63b48ded8eaa37b9f40cc0851c78882 (diff)
downloadpleroma-148bc244359e70c87ec2812c65da83fe87efbc68.tar.gz
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
-rw-r--r--lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
index 6c63fe15c..0fb05d3c4 100644
--- a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
@@ -13,17 +13,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
require Logger
@adapter_options [
- pool: :media
+ pool: :media,
+ recv_timeout: 10_000
]
- defp adapter_options do
- if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
- Keyword.put(@adapter_options, :recv_timeout, 10_000)
- else
- @adapter_options
- end
- end
-
def perform(:prefetch, url) do
# Fetching only proxiable resources
if MediaProxy.enabled?() and MediaProxy.url_proxiable?(url) do
@@ -32,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
Logger.debug("Prefetching #{inspect(url)} as #{inspect(prefetch_url)}")
- HTTP.get(prefetch_url, [], adapter: adapter_options())
+ HTTP.get(prefetch_url, [], @adapter_options)
end
end