diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 17:43:21 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 17:43:21 +0000 |
| commit | f76c1d4f70fdda6da621a46fb75891e68e266946 (patch) | |
| tree | 328aec763c24b6426decd30fe3b6a4674510bbee /restarter | |
| parent | d8e326467c30b95c5164f6e29512057dce3c2077 (diff) | |
| parent | 91c22637de5f1683a32207a606c33e7ef3b84676 (diff) | |
| download | pleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.tar.gz pleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.zip | |
Merge branch 'release/2.5.0' into 'stable'
Release 2.5.0
See merge request pleroma/pleroma!3816
Diffstat (limited to 'restarter')
| -rw-r--r-- | restarter/lib/pleroma.ex | 12 | ||||
| -rw-r--r-- | restarter/mix.exs | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/restarter/lib/pleroma.ex b/restarter/lib/pleroma.ex index 149a569ce..a7186cec4 100644 --- a/restarter/lib/pleroma.ex +++ b/restarter/lib/pleroma.ex @@ -61,6 +61,12 @@ defmodule Restarter.Pleroma do {:noreply, @init_state} end + # Don't actually restart during tests. + # We just check if the correct call has been done. + # If we actually restart, we get errors during the tests like + # (RuntimeError) could not lookup Ecto repo Pleroma.Repo because it was not started or + # it does not exist + # See tests in Pleroma.Config.TransferTaskTest def handle_cast({:restart, :test, _}, state) do Logger.debug("pleroma manually restarted") {:noreply, Map.put(state, :need_reboot, false)} @@ -74,6 +80,12 @@ defmodule Restarter.Pleroma do def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state} + # Don't actually restart during tests. + # We just check if the correct call has been done. + # If we actually restart, we get errors during the tests like + # (RuntimeError) could not lookup Ecto repo Pleroma.Repo because it was not started or + # it does not exist + # See tests in Pleroma.Config.TransferTaskTest def handle_cast({:after_boot, :test}, state) do Logger.debug("pleroma restarted after boot") state = %{state | after_boot: true, rebooted: true} diff --git a/restarter/mix.exs b/restarter/mix.exs index b0908aece..4bb9b76e2 100644 --- a/restarter/mix.exs +++ b/restarter/mix.exs @@ -5,7 +5,7 @@ defmodule Restarter.MixProject do [ app: :restarter, version: "0.1.0", - elixir: "~> 1.8", + elixir: "~> 1.10", start_permanent: Mix.env() == :prod, deps: deps() ] @@ -13,7 +13,8 @@ defmodule Restarter.MixProject do def application do [ - mod: {Restarter, []} + mod: {Restarter, []}, + extra_applications: [:logger] ] end |