diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-11-07 09:41:35 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-11-07 09:41:35 +0100 |
| commit | 6dfa62800ad6cdcef9e73ecdabe45363c574a528 (patch) | |
| tree | 7ecfdf554d3d980c8cb6c7b4800d7982e2bb4298 /lib/pleroma/web/websub | |
| parent | 7de3a652147d9b7da9cf3fd82d8a8438df93bae8 (diff) | |
| download | pleroma-6dfa62800ad6cdcef9e73ecdabe45363c574a528.tar.gz | |
Revert "Longer timeouts for user fetching."
Breaks too many tests.
This reverts commit 7de3a652147d9b7da9cf3fd82d8a8438df93bae8.
Diffstat (limited to 'lib/pleroma/web/websub')
| -rw-r--r-- | lib/pleroma/web/websub/websub.ex | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex index 41bdffb5b..db1577a93 100644 --- a/lib/pleroma/web/websub/websub.ex +++ b/lib/pleroma/web/websub/websub.ex @@ -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, |