diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-02 09:36:56 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-02 09:36:56 +0000 |
| commit | b2d776d77d25eaf8dc789005c856d86e4c38f86d (patch) | |
| tree | c2ab9bffe8241884adad33a229991ebb45516337 /config | |
| parent | 96de4bfbcacb963d85bd94781096e86bab3b7e0f (diff) | |
| parent | 84fbf1616104c09e0f4f5442d86ca2c573ae4056 (diff) | |
| download | pleroma-b2d776d77d25eaf8dc789005c856d86e4c38f86d.tar.gz pleroma-b2d776d77d25eaf8dc789005c856d86e4c38f86d.zip | |
Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 246712b9f..ea8869d48 100644 --- a/config/config.exs +++ b/config/config.exs @@ -740,19 +740,23 @@ config :pleroma, :connections_pool, config :pleroma, :pools, federation: [ size: 50, - max_waiting: 10 + max_waiting: 10, + timeout: 10_000 ], media: [ size: 50, - max_waiting: 10 + max_waiting: 10, + timeout: 10_000 ], upload: [ size: 25, - max_waiting: 5 + max_waiting: 5, + timeout: 15_000 ], default: [ size: 10, - max_waiting: 2 + max_waiting: 2, + timeout: 5_000 ] config :pleroma, :hackney_pools, |