mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 16:16:34 +00:00
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.
This commit is contained in:
parent
6757382abe
commit
a50c657427
2 changed files with 10 additions and 1 deletions
|
@ -827,6 +827,11 @@ config :pleroma, :pools,
|
||||||
max_waiting: 20,
|
max_waiting: 20,
|
||||||
recv_timeout: 15_000
|
recv_timeout: 15_000
|
||||||
],
|
],
|
||||||
|
rich_media: [
|
||||||
|
size: 25,
|
||||||
|
max_waiting: 20,
|
||||||
|
recv_timeout: 15_000
|
||||||
|
],
|
||||||
upload: [
|
upload: [
|
||||||
size: 25,
|
size: 25,
|
||||||
max_waiting: 5,
|
max_waiting: 5,
|
||||||
|
@ -847,6 +852,10 @@ config :pleroma, :hackney_pools,
|
||||||
max_connections: 50,
|
max_connections: 50,
|
||||||
timeout: 150_000
|
timeout: 150_000
|
||||||
],
|
],
|
||||||
|
rich_media: [
|
||||||
|
max_connections: 50,
|
||||||
|
timeout: 150_000
|
||||||
|
],
|
||||||
upload: [
|
upload: [
|
||||||
max_connections: 25,
|
max_connections: 25,
|
||||||
timeout: 300_000
|
timeout: 300_000
|
||||||
|
|
|
@ -58,7 +58,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do
|
||||||
|
|
||||||
defp http_options do
|
defp http_options do
|
||||||
[
|
[
|
||||||
pool: :media,
|
pool: :rich_media,
|
||||||
max_body: Config.get([:rich_media, :max_body], 5_000_000)
|
max_body: Config.get([:rich_media, :max_body], 5_000_000)
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue