projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use finch everywhere (#33)
[akkoma]
/
lib
/
mix
/
pleroma.ex
diff --git
a/lib/mix/pleroma.ex
b/lib/mix/pleroma.ex
index c2b607fb3ea4778664863c615cf7ef5027f6e021..4eff378599657b9bb1d480835e45683fc6659ad2 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,36
+12,45
@@
defmodule Mix.Pleroma do
:cachex,
:flake_id,
:swoosh,
:cachex,
:flake_id,
:swoosh,
- :timex
+ :timex,
+ :fast_html,
+ :oban
]
]
- @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)
+ Finch.start_link(name: MyFinch)
- if Pleroma.Config.get(:env) != :test do
- Application.put_env(:logger, :console, level: :debug)
- end
- adapter = Application.get_env(:tesla, :adapter)
+ unless System.get_env("DEBUG") do
+ Logger.remove_backend(:console)
+ end
- apps =
- if adapter == Tesla.Adapter.Gun do
- [:gun | @apps]
- else
- [:hackney | @apps]
- end
+ 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.Config.TransferTask, false},
- Pleroma.Web.Endpoint
+ Pleroma.Web.Endpoint,
+ {Oban, oban_config},
+ {Majic.Pool,
+ [name: Pleroma.MajicPool, pool_size: Pleroma.Config.get([:majic_pool, :size], 2)]}
] ++
] ++
-
http_children(adapter
)
+
elasticsearch_children(
)
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
@@
-95,12
+104,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),
@@
-120,10
+123,13
@@
defmodule Mix.Pleroma do
~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
end
~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
+ def elasticsearch_children do
+ config = Pleroma.Config.get([Pleroma.Search, :module])
- defp http_children(_), do: []
+ if config == Pleroma.Search.Elasticsearch do
+ [Pleroma.Search.Elasticsearch.Cluster]
+ else
+ []
+ end
+ end
end
end