diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-02 09:36:56 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 13:53:16 +0300 |
| commit | dccbed856df131900bf7851fbd11c518f85bce7a (patch) | |
| tree | 7d4d7c42ef5156cd24ea06f9316895b0860ce9b2 /config | |
| parent | ea4b6c64d60d1dc3246f5a2f23a2e3a47e8fb476 (diff) | |
| download | pleroma-dccbed856df131900bf7851fbd11c518f85bce7a.tar.gz | |
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 99bbb74e9..88f6125e5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -739,19 +739,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, |