X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Fpleroma.ex;h=6431f0a1c657028af41beff0e086ac54104e5477;hb=5e7be063c75c1e0dc8281a1951c60836e2def7b5;hp=a33a9951c48fb4eae4a2fc19b757acbb223f7a1b;hpb=cbce88007672dc810cb345bb9872a009cbdc93d8;p=akkoma
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index a33a9951c..6431f0a1c 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do
@@ -13,7 +13,8 @@ defmodule Mix.Pleroma do
:flake_id,
:swoosh,
:timex,
- :fast_html
+ :fast_html,
+ :oban
]
@cachex_children ["object", "user", "scrubber", "web_resp"]
@doc "Common functions to be reused in mix tasks"
@@ -23,20 +24,20 @@ defmodule Mix.Pleroma do
Pleroma.Application.limiters_setup()
Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
+ proxy_url = Pleroma.Config.get([:http, :proxy_url])
+ proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
+
+ finch_config =
+ [:http, :adapter]
+ |> Pleroma.Config.get([])
+ |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
+ |> Keyword.put(:name, MyFinch)
+
unless System.get_env("DEBUG") do
Logger.remove_backend(:console)
end
- adapter = Application.get_env(:tesla, :adapter)
-
- 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: [],
@@ -52,11 +53,12 @@ defmodule Mix.Pleroma do
Pleroma.Emoji,
{Pleroma.Config.TransferTask, false},
Pleroma.Web.Endpoint,
+ {Finch, finch_config},
{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, []))
@@ -129,10 +131,13 @@ defmodule Mix.Pleroma 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
+ 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