diff options
| author | lain <lain@soykaf.club> | 2024-05-28 04:38:01 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-05-28 04:38:01 +0000 |
| commit | 8ff0c32903938d84b7d7ae58af15b5b7a966ce33 (patch) | |
| tree | 993982d87277b6bc9c8203c01927d942152a6a27 /config | |
| parent | cdde3afb57e7147214290daab711736fb8fecaeb (diff) | |
| parent | ba511a30b923cc9248686702f75a4041d69c7bee (diff) | |
| download | pleroma-8ff0c32903938d84b7d7ae58af15b5b7a966ce33.tar.gz pleroma-8ff0c32903938d84b7d7ae58af15b5b7a966ce33.zip | |
Merge branch 'httpfixes' into 'develop'
Some HTTP and connection pool improvements
See merge request pleroma/pleroma!4124
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 039d68379..3804dd809 100644 --- a/config/config.exs +++ b/config/config.exs @@ -827,22 +827,27 @@ config :pleroma, :connections_pool, config :pleroma, :pools, federation: [ - size: 50, - max_waiting: 10, + size: 75, + max_waiting: 20, recv_timeout: 10_000 ], media: [ - size: 50, + size: 75, + max_waiting: 20, + recv_timeout: 15_000 + ], + rich_media: [ + size: 25, max_waiting: 20, recv_timeout: 15_000 ], upload: [ size: 25, - max_waiting: 5, + max_waiting: 20, recv_timeout: 15_000 ], default: [ - size: 10, + size: 50, max_waiting: 2, recv_timeout: 5_000 ] @@ -856,6 +861,10 @@ config :pleroma, :hackney_pools, max_connections: 50, timeout: 150_000 ], + rich_media: [ + max_connections: 50, + timeout: 150_000 + ], upload: [ max_connections: 25, timeout: 300_000 @@ -901,8 +910,6 @@ config :pleroma, Pleroma.User.Backup, process_chunk_size: 100 config :pleroma, ConcurrentLimiter, [ - {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, - {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}, {Pleroma.Search, [max_running: 30, max_waiting: 50]} ] |