From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Sat, 7 Mar 2020 09:41:37 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b2eb1124d115beda0907121c3c6f10783b34f352;p=akkoma

Merge branch 'develop' into gun
---

b2eb1124d115beda0907121c3c6f10783b34f352
diff --cc restarter/lib/pleroma.ex
index e48bc4d1d,7f08c637c..149a569ce
--- a/restarter/lib/pleroma.ex
+++ b/restarter/lib/pleroma.ex
@@@ -44,8 -62,8 +62,8 @@@ defmodule Restarter.Pleroma d
    end
  
    def handle_cast({:restart, :test, _}, state) do
 -    Logger.warn("pleroma restarted")
 +    Logger.debug("pleroma manually restarted")
-     {:noreply, Map.put(state, :need_reboot?, false)}
+     {:noreply, Map.put(state, :need_reboot, false)}
    end
  
    def handle_cast({:restart, _, delay}, state) do
@@@ -57,8 -75,9 +75,9 @@@
    def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state}
  
    def handle_cast({:after_boot, :test}, state) do
 -    Logger.warn("pleroma restarted")
 +    Logger.debug("pleroma restarted after boot")
-     {:noreply, Map.put(state, :after_boot, true)}
+     state = %{state | after_boot: true, rebooted: true}
+     {:noreply, state}
    end
  
    def handle_cast({:after_boot, _}, state) do