From dccbed856df131900bf7851fbd11c518f85bce7a Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 2 Sep 2020 09:36:56 +0000 Subject: Merge branch 'http-fixes' into 'develop' Improvements and fixes for http requests See merge request pleroma/pleroma!2904 --- config/config.exs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'config') 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, -- cgit v1.2.3