diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-07-03 20:12:00 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-07-08 15:58:47 +0300 |
| commit | b28cc154596ad9cbf5ef9708a5967672c61ddbdc (patch) | |
| tree | 7bcce0b0141c3df03bf81c037ab4a2c6c61416ab /lib | |
| parent | 72ad3a66f48d4500be1f25dd7b02b834399d3bbe (diff) | |
| download | pleroma-b28cc154596ad9cbf5ef9708a5967672c61ddbdc.tar.gz | |
don't restart pleroma in mix tasks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/pleroma.ex | 6 | ||||
| -rw-r--r-- | lib/pleroma/config/transfer_task.ex | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 553c74c25..0fbb6f1cd 100644 --- a/lib/mix/pleroma.ex +++ b/lib/mix/pleroma.ex @@ -22,7 +22,11 @@ defmodule Mix.Pleroma do Enum.each(apps, &Application.ensure_all_started/1) - childs = [Pleroma.Repo, Pleroma.Config.TransferTask, Pleroma.Web.Endpoint] + childs = [ + Pleroma.Repo, + {Pleroma.Config.TransferTask, false}, + Pleroma.Web.Endpoint + ] cachex_childs = Enum.map(@cachex_childs, &Pleroma.Application.build_cachex(&1, [])) diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index eb86b8ff4..a0d7b7d71 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -31,8 +31,8 @@ defmodule Pleroma.Config.TransferTask do {:pleroma, :gopher, [:enabled]} ] - def start_link(_) do - load_and_update_env() + def start_link(restart_pleroma? \\ true) do + load_and_update_env([], restart_pleroma?) if Config.get(:env) == :test, do: Ecto.Adapters.SQL.Sandbox.checkin(Repo) :ignore end |