projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cycles-mrf-policy' into 'develop'
[akkoma]
/
lib
/
mix
/
pleroma.ex
diff --git
a/lib/mix/pleroma.ex
b/lib/mix/pleroma.ex
index 6df1cf538156a3ddf7bed446b9e36ed0f0e361d9..2b6c7d6bbd13f364fefa396e66a778d6b480f2d6 100644
(file)
--- a/
lib/mix/pleroma.ex
+++ b/
lib/mix/pleroma.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do
@@
-12,7
+12,9
@@
defmodule Mix.Pleroma do
:cachex,
:flake_id,
:swoosh,
:cachex,
:flake_id,
:swoosh,
- :timex
+ :timex,
+ :fast_html,
+ :oban
]
@cachex_children ["object", "user", "scrubber", "web_resp"]
@doc "Common functions to be reused in mix tasks"
]
@cachex_children ["object", "user", "scrubber", "web_resp"]
@doc "Common functions to be reused in mix tasks"
@@
-22,8
+24,8
@@
defmodule Mix.Pleroma do
Pleroma.Application.limiters_setup()
Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
Pleroma.Application.limiters_setup()
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
adapter = Application.get_env(:tesla, :adapter)
end
adapter = Application.get_env(:tesla, :adapter)
@@
-37,12
+39,23
@@
defmodule Mix.Pleroma do
Enum.each(apps, &Application.ensure_all_started/1)
Enum.each(apps, &Application.ensure_all_started/1)
+ oban_config = [
+ crontab: [],
+ repo: Pleroma.Repo,
+ log: false,
+ queues: [],
+ plugins: []
+ ]
+
children =
[
Pleroma.Repo,
children =
[
Pleroma.Repo,
+ Pleroma.Emoji,
{Pleroma.Config.TransferTask, false},
Pleroma.Web.Endpoint,
{Pleroma.Config.TransferTask, false},
Pleroma.Web.Endpoint,
- {Oban, Pleroma.Config.get(Oban)}
+ {Oban, oban_config},
+ {Majic.Pool,
+ [name: Pleroma.MajicPool, pool_size: Pleroma.Config.get([:majic_pool, :size], 2)]}
] ++
http_children(adapter)
] ++
http_children(adapter)
@@
-98,12
+111,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),