wait in mix task while pleroma is rebooted
This commit is contained in:
parent
438394d404
commit
400fbc7629
@ -12,6 +12,19 @@ defmodule Mix.Pleroma do
|
|||||||
end
|
end
|
||||||
|
|
||||||
{:ok, _} = Application.ensure_all_started(:pleroma)
|
{: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
|
end
|
||||||
|
|
||||||
def load_pleroma do
|
def load_pleroma do
|
||||||
|
@ -42,7 +42,8 @@ defmodule Pleroma.Config.TransferTask do
|
|||||||
|
|
||||||
@spec load_and_update_env([ConfigDB.t()]) :: :ok | false
|
@spec load_and_update_env([ConfigDB.t()]) :: :ok | false
|
||||||
def load_and_update_env(deleted \\ [], restart_pleroma? \\ true) do
|
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"),
|
true <- Ecto.Adapters.SQL.table_exists?(Repo, "config"),
|
||||||
started_applications <- Application.started_applications() do
|
started_applications <- Application.started_applications() do
|
||||||
# We need to restart applications for loaded settings take effect
|
# We need to restart applications for loaded settings take effect
|
||||||
@ -65,12 +66,15 @@ defmodule Pleroma.Config.TransferTask do
|
|||||||
if :pleroma in applications do
|
if :pleroma in applications do
|
||||||
List.delete(applications, :pleroma) ++ [:pleroma]
|
List.delete(applications, :pleroma) ++ [:pleroma]
|
||||||
else
|
else
|
||||||
|
Restarter.Pleroma.rebooted()
|
||||||
applications
|
applications
|
||||||
end
|
end
|
||||||
|
|
||||||
Enum.each(applications, &restart(started_applications, &1, Pleroma.Config.get(:env)))
|
Enum.each(applications, &restart(started_applications, &1, Pleroma.Config.get(:env)))
|
||||||
|
|
||||||
:ok
|
:ok
|
||||||
|
else
|
||||||
|
{:configurable, false} -> Restarter.Pleroma.rebooted()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -3,11 +3,21 @@ defmodule Restarter.Pleroma do
|
|||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
|
@init_state %{need_reboot: false, rebooted: false, after_boot: false}
|
||||||
|
|
||||||
def start_link(_) do
|
def start_link(_) do
|
||||||
GenServer.start_link(__MODULE__, [], name: __MODULE__)
|
GenServer.start_link(__MODULE__, [], name: __MODULE__)
|
||||||
end
|
end
|
||||||
|
|
||||||
def init(_), do: {:ok, %{need_reboot?: false}}
|
def init(_), do: {:ok, @init_state}
|
||||||
|
|
||||||
|
def rebooted? do
|
||||||
|
GenServer.call(__MODULE__, :rebooted?)
|
||||||
|
end
|
||||||
|
|
||||||
|
def rebooted do
|
||||||
|
GenServer.cast(__MODULE__, :rebooted)
|
||||||
|
end
|
||||||
|
|
||||||
def need_reboot? do
|
def need_reboot? do
|
||||||
GenServer.call(__MODULE__, :need_reboot?)
|
GenServer.call(__MODULE__, :need_reboot?)
|
||||||
@ -29,41 +39,51 @@ defmodule Restarter.Pleroma do
|
|||||||
GenServer.cast(__MODULE__, {:after_boot, env})
|
GenServer.cast(__MODULE__, {:after_boot, env})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def handle_call(:rebooted?, _from, state) do
|
||||||
|
{:reply, state[:rebooted], state}
|
||||||
|
end
|
||||||
|
|
||||||
def handle_call(:need_reboot?, _from, state) do
|
def handle_call(:need_reboot?, _from, state) do
|
||||||
{:reply, state[:need_reboot?], state}
|
{:reply, state[:need_reboot], state}
|
||||||
|
end
|
||||||
|
|
||||||
|
def handle_cast(:rebooted, state) do
|
||||||
|
{:noreply, Map.put(state, :rebooted, true)}
|
||||||
|
end
|
||||||
|
|
||||||
|
def handle_cast(:need_reboot, %{need_reboot: true} = state), do: {:noreply, state}
|
||||||
|
|
||||||
|
def handle_cast(:need_reboot, state) do
|
||||||
|
{:noreply, Map.put(state, :need_reboot, true)}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast(:refresh, _state) do
|
def handle_cast(:refresh, _state) do
|
||||||
{:noreply, %{need_reboot?: false}}
|
{:noreply, @init_state}
|
||||||
end
|
|
||||||
|
|
||||||
def handle_cast(:need_reboot, %{need_reboot?: true} = state), do: {:noreply, state}
|
|
||||||
|
|
||||||
def handle_cast(:need_reboot, state) do
|
|
||||||
{:noreply, Map.put(state, :need_reboot?, true)}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast({:restart, :test, _}, state) do
|
def handle_cast({:restart, :test, _}, state) do
|
||||||
Logger.warn("pleroma restarted")
|
Logger.warn("pleroma restarted")
|
||||||
{:noreply, Map.put(state, :need_reboot?, false)}
|
{:noreply, Map.put(state, :need_reboot, false)}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast({:restart, _, delay}, state) do
|
def handle_cast({:restart, _, delay}, state) do
|
||||||
Process.sleep(delay)
|
Process.sleep(delay)
|
||||||
do_restart(:pleroma)
|
do_restart(:pleroma)
|
||||||
{:noreply, Map.put(state, :need_reboot?, false)}
|
{:noreply, Map.put(state, :need_reboot, false)}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state}
|
def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state}
|
||||||
|
|
||||||
def handle_cast({:after_boot, :test}, state) do
|
def handle_cast({:after_boot, :test}, state) do
|
||||||
Logger.warn("pleroma restarted")
|
Logger.warn("pleroma restarted")
|
||||||
{:noreply, Map.put(state, :after_boot, true)}
|
state = %{state | after_boot: true, rebooted: true}
|
||||||
|
{:noreply, state}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast({:after_boot, _}, state) do
|
def handle_cast({:after_boot, _}, state) do
|
||||||
do_restart(:pleroma)
|
do_restart(:pleroma)
|
||||||
{:noreply, Map.put(state, :after_boot, true)}
|
state = %{state | after_boot: true, rebooted: true}
|
||||||
|
{:noreply, state}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp do_restart(app) do
|
defp do_restart(app) do
|
||||||
|
Loading…
Reference in New Issue
Block a user