diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-21 05:15:29 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-21 05:15:29 +0000 |
| commit | be6b57193a99a32134546efb667391eda4d4acdf (patch) | |
| tree | 81af948c19b3cd2b35e2678c25c46b10728f4985 | |
| parent | 94caca924d94b8d976f4f362515e0d4eb7b9d4fb (diff) | |
| parent | c972d0bb14ee5a65f053b8c9629d93fc9b94ca78 (diff) | |
| download | pleroma-be6b57193a99a32134546efb667391eda4d4acdf.tar.gz | |
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/http/connection.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e6bce31..256df91b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Don't ship finmoji by default, they can be installed as an emoji pack - Hide deactivated users and their statuses - Posts which are marked sensitive or tagged nsfw no longer have link previews. +- HTTP connection timeout is now set to 10 seconds. ### Fixed - Added an FTS index on objects. Running `vacuum analyze` and setting a larger `work_mem` is recommended. diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index c0173465a..558005c19 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -8,7 +8,7 @@ defmodule Pleroma.HTTP.Connection do """ @hackney_options [ - connect_timeout: 2_000, + connect_timeout: 10_000, recv_timeout: 20_000, follow_redirect: true, pool: :federation |