summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/hackney-pool-timeouts.change1
-rw-r--r--config/config.exs8
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