a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

[#2497] Removed Hackney-specific code 

(no longer needed due to adapter options unification).
This commit is contained in:
Ivan Tashkinov 2020-09-10 11:54:10 +03:00
parent b4860c57a6
commit 148bc24435
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
View File

@ -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