diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-04-30 13:17:03 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-04-30 13:17:03 -0500 |
| commit | 52fc59f125c10ad73b9fd1a0639b6dc5681776ca (patch) | |
| tree | 7de32329acbdd4bdf5c753678a2d459c61b58d80 /lib/mix/pleroma.ex | |
| parent | a8fa00ef666f574aec8048626aed78a7d62e6915 (diff) | |
| parent | 377f84f3678f9c2541fbd4a200cd93c5ab0dea24 (diff) | |
| download | pleroma-52fc59f125c10ad73b9fd1a0639b6dc5681776ca.tar.gz pleroma-52fc59f125c10ad73b9fd1a0639b6dc5681776ca.zip | |
Merge remote-tracking branch 'upstream/develop' into earmark
Diffstat (limited to 'lib/mix/pleroma.ex')
| -rw-r--r-- | lib/mix/pleroma.ex | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 7575f0ef8..2b6c7d6bb 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 <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Mix.Pleroma do @@ -12,7 +12,9 @@ defmodule Mix.Pleroma do :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" @@ -37,12 +39,23 @@ defmodule Mix.Pleroma do Enum.each(apps, &Application.ensure_all_started/1) + oban_config = [ + crontab: [], + repo: Pleroma.Repo, + log: false, + queues: [], + plugins: [] + ] + children = [ Pleroma.Repo, + Pleroma.Emoji, {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) |