diff options
author | href <href@random.sh> | 2019-01-30 12:38:38 +0100 |
---|---|---|
committer | href <href@random.sh> | 2019-01-30 15:06:46 +0100 |
commit | 4aff4efa8d53988d00381b1346241359cf787e87 (patch) | |
tree | 218976087d51f7e1065c7aa966c6530d774e6c11 /lib/pleroma/application.ex | |
parent | 97694eb4512da86440e87ce201a631494af6ea6c (diff) | |
download | pleroma-4aff4efa8d53988d00381b1346241359cf787e87.tar.gz |
Use multiple hackney pools
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r-- | lib/pleroma/application.ex | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index c65bebb3b..f775cd53d 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -101,12 +101,15 @@ defmodule Pleroma.Application do ], id: :cachex_idem ), - worker(Pleroma.FlakeId, []), - worker(Pleroma.Web.Federator.RetryQueue, []), - worker(Pleroma.Web.Federator, []), - worker(Pleroma.Stats, []), - worker(Pleroma.Web.Push, []) + worker(Pleroma.FlakeId, []) ] ++ + hackney_pool_children() ++ + [ + worker(Pleroma.Web.Federator.RetryQueue, []), + worker(Pleroma.Web.Federator, []), + worker(Pleroma.Stats, []), + worker(Pleroma.Web.Push, []) + ] ++ streamer_child() ++ chat_child() ++ [ @@ -121,6 +124,20 @@ defmodule Pleroma.Application do Supervisor.start_link(children, opts) end + def enabled_hackney_pools() do + [:media] ++ + if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do + [:federation] + else + [] + end ++ + if Pleroma.Config.get([Pleroma.Uploader, :proxy_remote]) do + [:uploadproxy] + else + [] + end + end + if Mix.env() == :test do defp streamer_child(), do: [] defp chat_child(), do: [] @@ -137,4 +154,11 @@ defmodule Pleroma.Application do end end end + + defp hackney_pool_children() do + for pool <- enabled_hackney_pools() do + options = Pleroma.Config.get([:hackney_pools, pool]) + :hackney_pool.child_spec(pool, options) + end + end end |