X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Fpleroma.ex;h=4dfcc32e78cbf2a4c7c09b618435675949ff01ac;hb=5e365448f3fed98da0395ad69c9325795a85a12d;hp=90f8c80081dfe1380c3c792db3acd89706151436;hpb=6f7a8c43a200d2d0166e4e544aee1e6104bcb671;p=akkoma

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 90f8c8008..4dfcc32e7 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -5,6 +5,7 @@
 defmodule Mix.Pleroma do
   @doc "Common functions to be reused in mix tasks"
   def start_pleroma do
+    Mix.Task.run("app.start")
     Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
 
     if Pleroma.Config.get(:env) != :test do
@@ -12,6 +13,19 @@ defmodule Mix.Pleroma do
     end
 
     {:ok, _} = Application.ensure_all_started(:pleroma)
+
+    if Pleroma.Config.get(:env) not in [:test, :benchmark] do
+      pleroma_rebooted?()
+    end
+  end
+
+  defp pleroma_rebooted? do
+    if Restarter.Pleroma.rebooted?() do
+      :ok
+    else
+      Process.sleep(10)
+      pleroma_rebooted?()
+    end
   end
 
   def load_pleroma do