projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mix tasks that make HTTP calls by starting the Gun connection pool
[akkoma]
/
lib
/
mix
/
pleroma.ex
diff --git
a/lib/mix/pleroma.ex
b/lib/mix/pleroma.ex
index de16cc52c920b5298ee90043975e7f9c65d95700..c2b607fb3ea4778664863c615cf7ef5027f6e021 100644
(file)
--- a/
lib/mix/pleroma.ex
+++ b/
lib/mix/pleroma.ex
@@
-3,8
+3,18
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do
- @apps [:restarter, :ecto, :ecto_sql, :postgrex, :db_connection, :cachex]
- @cachex_childs ["object", "user"]
+ @apps [
+ :restarter,
+ :ecto,
+ :ecto_sql,
+ :postgrex,
+ :db_connection,
+ :cachex,
+ :flake_id,
+ :swoosh,
+ :timex
+ ]
+ @cachex_children ["object", "user"]
@doc "Common functions to be reused in mix tasks"
def start_pleroma do
Pleroma.Config.Holder.save_default()
@doc "Common functions to be reused in mix tasks"
def start_pleroma do
Pleroma.Config.Holder.save_default()
@@
-14,8
+24,10
@@
defmodule Mix.Pleroma do
Application.put_env(:logger, :console, level: :debug)
end
Application.put_env(:logger, :console, level: :debug)
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]
else
[:hackney | @apps]
[:gun | @apps]
else
[:hackney | @apps]
@@
-23,15
+35,17
@@
defmodule Mix.Pleroma do
Enum.each(apps, &Application.ensure_all_started/1)
Enum.each(apps, &Application.ensure_all_started/1)
- childs = [
- Pleroma.Repo,
- {Pleroma.Config.TransferTask, false},
- Pleroma.Web.Endpoint
- ]
+ children =
+ [
+ Pleroma.Repo,
+ {Pleroma.Config.TransferTask, false},
+ Pleroma.Web.Endpoint
+ ] ++
+ http_children(adapter)
- cachex_child
s = Enum.map(@cachex_childs
, &Pleroma.Application.build_cachex(&1, []))
+ cachex_child
ren = Enum.map(@cachex_children
, &Pleroma.Application.build_cachex(&1, []))
- Supervisor.start_link(child
s ++ cachex_childs
,
+ Supervisor.start_link(child
ren ++ cachex_children
,
strategy: :one_for_one,
name: Pleroma.Supervisor
)
strategy: :one_for_one,
name: Pleroma.Supervisor
)
@@
-105,4
+119,11
@@
defmodule Mix.Pleroma do
def escape_sh_path(path) do
~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
end
def escape_sh_path(path) do
~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
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