Commit 27792b2d authored by Hakaba Hitoyo's avatar Hakaba Hitoyo
Browse files

remove pool and timeout options which duplicate with the default

parent 505d8208
......@@ -3,7 +3,11 @@ defmodule Pleroma.HTTP.Connection do
Connection for http-requests.
"""
@hackney_options [pool: :default]
@hackney_options [
pool: :default,
timeout: 10000,
recv_timeout: 20000
]
@adapter Application.get_env(:tesla, :adapter)
@doc """
......
......@@ -766,9 +766,7 @@ def fetch_and_contain_remote_object_from_id(id) do
@httpoison.get(
id,
[Accept: "application/activity+json"],
follow_redirect: true,
timeout: 10000,
recv_timeout: 20000
follow_redirect: true
),
{:ok, data} <- Jason.decode(body),
:ok <- Transmogrifier.contain_origin_from_id(id, data) do
......
......@@ -350,11 +350,7 @@ def fetch_activity_from_atom_url(url) do
@httpoison.get(
url,
[Accept: "application/atom+xml"],
follow_redirect: true,
adapter: [
timeout: 10000,
recv_timeout: 20000
]
follow_redirect: true
) do
Logger.debug("Got document from #{url}, handling...")
handle_incoming(body)
......@@ -369,8 +365,7 @@ def fetch_activity_from_html_url(url) do
Logger.debug("Trying to fetch #{url}")
with true <- String.starts_with?(url, "http"),
{:ok, %{body: body}} <-
@httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
{:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true),
{:ok, atom_url} <- get_atom_url(body) do
fetch_activity_from_atom_url(atom_url)
else
......
......@@ -162,12 +162,7 @@ defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do
poster.(
salmon,
feed,
[{"Content-Type", "application/magic-envelope+xml"}],
adapter: [
timeout: 10000,
recv_timeout: 20000,
pool: :default
]
[{"Content-Type", "application/magic-envelope+xml"}]
) do
Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
else
......
......@@ -264,11 +264,6 @@ def publish_one(%{xml: xml, topic: topic, callback: callback, secret: secret}) d
[
{"Content-Type", "application/atom+xml"},
{"X-Hub-Signature", "sha1=#{signature}"}
],
adapter: [
timeout: 10000,
recv_timeout: 20000,
pool: :default
]
) do
Logger.info(fn -> "Pushed to #{callback}, code #{code}" end)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment