Add option to modify HTTP pool size
This commit is contained in:
parent
126f1ca69c
commit
dcac8adb3d
8 changed files with 28 additions and 7 deletions
|
@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- Prometheus metrics exporting from `/api/v1/akkoma/metrics`
|
- Prometheus metrics exporting from `/api/v1/akkoma/metrics`
|
||||||
|
- Ability to alter http pool size
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
- Non-finch HTTP adapters
|
- Non-finch HTTP adapters
|
||||||
|
|
|
@ -179,6 +179,7 @@ config :pleroma, :http,
|
||||||
receive_timeout: :timer.seconds(15),
|
receive_timeout: :timer.seconds(15),
|
||||||
proxy_url: nil,
|
proxy_url: nil,
|
||||||
user_agent: :default,
|
user_agent: :default,
|
||||||
|
pool_size: 50,
|
||||||
adapter: []
|
adapter: []
|
||||||
|
|
||||||
config :pleroma, :instance,
|
config :pleroma, :instance,
|
||||||
|
|
|
@ -2661,6 +2661,13 @@ config :pleroma, :config_description, [
|
||||||
"What user agent to use. Must be a string or an atom `:default`. Default value is `:default`.",
|
"What user agent to use. Must be a string or an atom `:default`. Default value is `:default`.",
|
||||||
suggestions: ["Pleroma", :default]
|
suggestions: ["Pleroma", :default]
|
||||||
},
|
},
|
||||||
|
%{
|
||||||
|
key: :pool_size,
|
||||||
|
type: :integer,
|
||||||
|
description:
|
||||||
|
"Number of concurrent outbound HTTP requests to allow. Default 50.",
|
||||||
|
suggestions: [50]
|
||||||
|
},
|
||||||
%{
|
%{
|
||||||
key: :adapter,
|
key: :adapter,
|
||||||
type: :keyword,
|
type: :keyword,
|
||||||
|
|
|
@ -259,10 +259,12 @@ defmodule Pleroma.Application do
|
||||||
defp http_children do
|
defp http_children do
|
||||||
proxy_url = Config.get([:http, :proxy_url])
|
proxy_url = Config.get([:http, :proxy_url])
|
||||||
proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
|
proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
|
||||||
|
pool_size = Config.get([:http, :pool_size])
|
||||||
|
|
||||||
config =
|
config =
|
||||||
[:http, :adapter]
|
[:http, :adapter]
|
||||||
|> Config.get([])
|
|> Config.get([])
|
||||||
|
|> Pleroma.HTTP.AdapterHelper.add_pool_size(pool_size)
|
||||||
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
|
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
|
||||||
|> Keyword.put(:name, MyFinch)
|
|> Keyword.put(:name, MyFinch)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,9 @@ defmodule Pleroma.Config.TransferTask do
|
||||||
do: [
|
do: [
|
||||||
{:pleroma, Pleroma.Captcha, [:seconds_valid]},
|
{:pleroma, Pleroma.Captcha, [:seconds_valid]},
|
||||||
{:pleroma, Pleroma.Upload, [:proxy_remote]},
|
{:pleroma, Pleroma.Upload, [:proxy_remote]},
|
||||||
{:pleroma, :instance, [:upload_limit]}
|
{:pleroma, :instance, [:upload_limit]},
|
||||||
|
{:pleroma, :http, [:pool_size]},
|
||||||
|
{:pleroma, :http, [:proxy_url]}
|
||||||
]
|
]
|
||||||
|
|
||||||
def start_link(restart_pleroma? \\ true) do
|
def start_link(restart_pleroma? \\ true) do
|
||||||
|
|
|
@ -47,6 +47,13 @@ defmodule Pleroma.HTTP.AdapterHelper do
|
||||||
|> put_in([:pools, :default, :conn_opts, :proxy], proxy)
|
|> put_in([:pools, :default, :conn_opts, :proxy], proxy)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def add_pool_size(opts, pool_size) do
|
||||||
|
opts
|
||||||
|
|> maybe_add_pools()
|
||||||
|
|> maybe_add_default_pool()
|
||||||
|
|> put_in([:pools, :default, :size], pool_size)
|
||||||
|
end
|
||||||
|
|
||||||
defp maybe_add_pools(opts) do
|
defp maybe_add_pools(opts) do
|
||||||
if Keyword.has_key?(opts, :pools) do
|
if Keyword.has_key?(opts, :pools) do
|
||||||
opts
|
opts
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"files": { },
|
|
||||||
"pack": {
|
|
||||||
"description": "Dump pack", "homepage": "https://pleroma.social",
|
|
||||||
"license": "Test license", "share-files": true
|
|
||||||
}}
|
|
|
@ -66,4 +66,11 @@ defmodule Pleroma.HTTP.AdapterHelperTest do
|
||||||
assert options[:receive_timeout] == 20_000
|
assert options[:receive_timeout] == 20_000
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "pool size settings" do
|
||||||
|
test "should get set" do
|
||||||
|
options = AdapterHelper.add_pool_size([], 50)
|
||||||
|
assert options[:pools][:default][:size] == 50
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue