pleroma

commit: 355b028c23bf977ff2006d384d2a66d2a9dfa28b
parent a90838accfde9ad8c188a00acf1352453ff23d25
Author: feld <feld@feld.me>
Date:   Tue, 30 Jul 2024 15:33:17 +0000

Merge branch 'hackney-pool-timeout' into 'develop'

Align Hackney and Gun connection pool timeouts

See merge request pleroma/pleroma!4197
Diffstat:
A
changelog.d/hackney-pool-timeouts.change
1
+
M
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
@@ -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
@@ -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