projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
lib
/
mix
/
pleroma.ex
diff --git
a/lib/mix/pleroma.ex
b/lib/mix/pleroma.ex
index 9f0bf6ecbc4fc3e3f858f0708949a7009d1ace28..a33a9951c48fb4eae4a2fc19b757acbb223f7a1b 100644
(file)
--- a/
lib/mix/pleroma.ex
+++ b/
lib/mix/pleroma.ex
@@
-12,20
+12,25
@@
defmodule Mix.Pleroma do
:cachex,
:flake_id,
:swoosh,
:cachex,
:flake_id,
:swoosh,
- :timex
+ :timex,
+ :fast_html
]
]
- @cachex_children ["object", "user"]
+ @cachex_children ["object", "user"
, "scrubber", "web_resp"
]
@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()
+ Pleroma.Config.Oban.warn()
+ Pleroma.Application.limiters_setup()
Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
-
if Pleroma.Config.get(:env) != :test
do
-
Application.put_env(:logger, :console, level: :debug
)
+
unless System.get_env("DEBUG")
do
+
Logger.remove_backend(:console
)
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]
else
[:hackney | @apps]
[:gun | @apps]
else
[:hackney | @apps]
@@
-33,12
+38,26
@@
defmodule Mix.Pleroma do
Enum.each(apps, &Application.ensure_all_started/1)
Enum.each(apps, &Application.ensure_all_started/1)
- children = [
- Pleroma.Repo,
- {Pleroma.Config.TransferTask, false},
- Pleroma.Web.Endpoint
+ oban_config = [
+ crontab: [],
+ repo: Pleroma.Repo,
+ log: false,
+ queues: [],
+ plugins: []
]
]
+ children =
+ [
+ Pleroma.Repo,
+ Pleroma.Emoji,
+ {Pleroma.Config.TransferTask, false},
+ Pleroma.Web.Endpoint,
+ {Oban, oban_config},
+ {Majic.Pool,
+ [name: Pleroma.MajicPool, pool_size: Pleroma.Config.get([:majic_pool, :size], 2)]}
+ ] ++
+ http_children(adapter)
+
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
Supervisor.start_link(children ++ cachex_children,
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
Supervisor.start_link(children ++ cachex_children,
@@
-91,12
+110,6
@@
defmodule Mix.Pleroma do
end
end
end
end
- def shell_yes?(message) do
- if mix_shell?(),
- do: Mix.shell().yes?("Continue?"),
- else: shell_prompt(message, "Continue?") in ~w(Yn Y y)
- end
-
def shell_info(message) do
if mix_shell?(),
do: Mix.shell().info(message),
def shell_info(message) do
if mix_shell?(),
do: Mix.shell().info(message),
@@
-115,4
+128,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