aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/config/transfer_task.ex
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-02-18 18:10:39 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-01 12:36:09 +0300
commit400fbc7629ff0fbf931cd5cc84d8ce170cd38e1d (patch)
tree768faf7c194707d0471c1fbd35d3dd8eb90dc930 /lib/pleroma/config/transfer_task.ex
parent438394d40447bdfb590ff206ad80907294da0e65 (diff)
downloadpleroma-400fbc7629ff0fbf931cd5cc84d8ce170cd38e1d.tar.gz
wait in mix task while pleroma is rebooted
Diffstat (limited to 'lib/pleroma/config/transfer_task.ex')
-rw-r--r--lib/pleroma/config/transfer_task.ex6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex
index f037ce8a5..01a3de05f 100644
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@ -42,7 +42,8 @@ defmodule Pleroma.Config.TransferTask do
@spec load_and_update_env([ConfigDB.t()]) :: :ok | false
def load_and_update_env(deleted \\ [], restart_pleroma? \\ true) do
- with true <- Pleroma.Config.get(:configurable_from_database),
+ with {:configurable, true} <-
+ {:configurable, Pleroma.Config.get(:configurable_from_database)},
true <- Ecto.Adapters.SQL.table_exists?(Repo, "config"),
started_applications <- Application.started_applications() do
# We need to restart applications for loaded settings take effect
@@ -65,12 +66,15 @@ defmodule Pleroma.Config.TransferTask do
if :pleroma in applications do
List.delete(applications, :pleroma) ++ [:pleroma]
else
+ Restarter.Pleroma.rebooted()
applications
end
Enum.each(applications, &restart(started_applications, &1, Pleroma.Config.get(:env)))
:ok
+ else
+ {:configurable, false} -> Restarter.Pleroma.rebooted()
end
end