diff options
| author | feld <feld@feld.me> | 2024-07-30 15:33:17 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-07-30 15:33:17 +0000 |
| commit | 355b028c23bf977ff2006d384d2a66d2a9dfa28b (patch) | |
| tree | 6f8827a6265c9a02005ed18169db6b54c6365ff3 | |
| parent | a90838accfde9ad8c188a00acf1352453ff23d25 (diff) | |
| parent | 49f46220ff670c68363da43db135c5d35229cc5d (diff) | |
| download | pleroma-355b028c23bf977ff2006d384d2a66d2a9dfa28b.tar.gz pleroma-355b028c23bf977ff2006d384d2a66d2a9dfa28b.zip | |
Merge branch 'hackney-pool-timeout' into 'develop'
Align Hackney and Gun connection pool timeouts
See merge request pleroma/pleroma!4197
| -rw-r--r-- | changelog.d/hackney-pool-timeouts.change | 1 | ||||
| -rw-r--r-- | config/config.exs | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/hackney-pool-timeouts.change b/changelog.d/hackney-pool-timeouts.change new file mode 100644 index 000000000..d763fe602 --- /dev/null +++ b/changelog.d/hackney-pool-timeouts.change @@ -0,0 +1 @@ +Change Hackney connection pool timeouts to align with the values Gun uses diff --git a/config/config.exs b/config/config.exs index 226d73df4..2a9c8dfaa 100644 --- a/config/config.exs +++ b/config/config.exs @@ -858,19 +858,19 @@ config :pleroma, :pools, config :pleroma, :hackney_pools, federation: [ max_connections: 50, - timeout: 150_000 + timeout: 10_000 ], media: [ max_connections: 50, - timeout: 150_000 + timeout: 15_000 ], rich_media: [ max_connections: 50, - timeout: 150_000 + timeout: 15_000 ], upload: [ max_connections: 25, - timeout: 300_000 + timeout: 15_000 ] config :pleroma, :majic_pool, size: 2 |