mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-12-25 02:19:31 +00:00
Merge branch 'fix/mix-tasks' into 'develop'
Fix/mix tasks Closes #1972 and #1970 See merge request pleroma/pleroma!2795
This commit is contained in:
commit
ce9647aed7
|
@ -24,8 +24,10 @@ defmodule Mix.Pleroma do
|
||||||
Application.put_env(:logger, :console, level: :debug)
|
Application.put_env(:logger, :console, level: :debug)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
adapter = Application.get_env(:tesla, :adapter)
|
||||||
|
|
||||||
apps =
|
apps =
|
||||||
if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
|
if adapter == Tesla.Adapter.Gun do
|
||||||
[:gun | @apps]
|
[:gun | @apps]
|
||||||
else
|
else
|
||||||
[:hackney | @apps]
|
[:hackney | @apps]
|
||||||
|
@ -33,11 +35,14 @@ defmodule Mix.Pleroma do
|
||||||
|
|
||||||
Enum.each(apps, &Application.ensure_all_started/1)
|
Enum.each(apps, &Application.ensure_all_started/1)
|
||||||
|
|
||||||
children = [
|
children =
|
||||||
Pleroma.Repo,
|
[
|
||||||
{Pleroma.Config.TransferTask, false},
|
Pleroma.Repo,
|
||||||
Pleroma.Web.Endpoint
|
{Pleroma.Config.TransferTask, false},
|
||||||
]
|
Pleroma.Web.Endpoint,
|
||||||
|
{Oban, Pleroma.Config.get(Oban)}
|
||||||
|
] ++
|
||||||
|
http_children(adapter)
|
||||||
|
|
||||||
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
|
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
|
||||||
|
|
||||||
|
@ -115,4 +120,11 @@ defmodule Mix.Pleroma do
|
||||||
def escape_sh_path(path) do
|
def escape_sh_path(path) do
|
||||||
~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
|
~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp http_children(Tesla.Adapter.Gun) do
|
||||||
|
Pleroma.Gun.ConnectionPool.children() ++
|
||||||
|
[{Task, &Pleroma.HTTP.AdapterHelper.Gun.limiter_setup/0}]
|
||||||
|
end
|
||||||
|
|
||||||
|
defp http_children(_), do: []
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue