From 49f46220ff670c68363da43db135c5d35229cc5d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 30 Jul 2024 11:11:30 -0400
Subject: [PATCH] Align Hackney and Gun connection pool timeouts

---
 changelog.d/hackney-pool-timeouts.change | 1 +
 config/config.exs                        | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/hackney-pool-timeouts.change

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 4780892f7..d9754d9c8 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