From a50c657427a2dfe9d48c25529a179fe634d30e48 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 11:17:02 -0400
Subject: Add a dedicated connection pool for Rich Media

Sharing this pool with regular Media is problematic as Rich Media will connect to many different
domains and thrash the pool, but regular Media will have predictable connections to the webservers
hosting media for the fediverse servers you peer with.
---
 config/config.exs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'config/config.exs')

diff --git a/config/config.exs b/config/config.exs
index 8b9a588b7..b8030651f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -827,6 +827,11 @@ config :pleroma, :pools,
     max_waiting: 20,
     recv_timeout: 15_000
   ],
+  rich_media: [
+    size: 25,
+    max_waiting: 20,
+     recv_timeout: 15_000
+   ],
   upload: [
     size: 25,
     max_waiting: 5,
@@ -847,6 +852,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
-- 
cgit v1.2.3


From 6708f154a4f7ad46b4637d4d566b8cf81e3ebb7b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 11:18:58 -0400
Subject: Rework Gun connection pool sizes to make better use of the default
 250 connections

---
 config/config.exs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'config/config.exs')

diff --git a/config/config.exs b/config/config.exs
index b8030651f..a025defeb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -818,27 +818,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
-   ],
+    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
   ]
-- 
cgit v1.2.3


From 6b8c15a4a1fdbc2a2a4ef194d9519e717470c632 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 14:11:42 -0400
Subject: Remove MediaProxyWarmingPolicy config for ConcurrentLimiter as we are
 not using it

---
 config/config.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config/config.exs')

diff --git a/config/config.exs b/config/config.exs
index a025defeb..3c35f439a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -902,7 +902,6 @@ config :pleroma, Pleroma.User.Backup,
 
 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]}
 ]
 
-- 
cgit v1.2.3


From ba511a30b923cc9248686702f75a4041d69c7bee Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 27 May 2024 14:12:38 -0400
Subject: RichMedia use of ConcurrentLimiter was removed in the refactor

---
 config/config.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config/config.exs')

diff --git a/config/config.exs b/config/config.exs
index 3c35f439a..e7e751d8a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -901,7 +901,6 @@ config :pleroma, Pleroma.User.Backup,
   process_chunk_size: 100
 
 config :pleroma, ConcurrentLimiter, [
-  {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
   {Pleroma.Search, [max_running: 30, max_waiting: 50]}
 ]
 
-- 
cgit v1.2.3