hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Longer timeouts for user fetching."

Browse source 
Breaks too many tests.

This reverts commit 7de3a65214.
This commit is contained in:
Roger Braun 2017-11-07 09:41:35 +01:00
commit 6dfa62800a
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/websub/websub.ex
View file

@ -142,11 +142,7 @@ defmodule Pleroma.Web.Websub do
requester.(subscription)
end
def long_get(url) do
@httpoison.get(url, [], timeout: 10_000, recv_timeout: 20_000)
end
def gather_feed_data(topic, getter \\ &long_get/1) do
def gather_feed_data(topic, getter \\ &@httpoison.get/1) do
with {:ok, response} <- getter.(topic),
status_code when status_code in 200..299 <- response.status_code,
body <- response.body,