pleroma

commit: 4e7418d963139e0fdb6d00c1fc6785c6a1563364
parent d8d4e962304c5424de4d171d25445b7135a67a09
Author: lain <lain@soykaf.club>
Date:   Wed,  4 Nov 2020 16:15:04 +0000

Merge branch 'stats-genserver-fix' into 'develop'

don't run  Stats GenServer updates in tests

See merge request pleroma/pleroma!2976
Diffstat:
M
lib/pleroma/stats.ex
19
+++++--------------

1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
@@ -23,7 +23,6 @@ defmodule Pleroma.Stats do
 
   @impl true
   def init(_args) do
-    if Pleroma.Config.get(:env) == :test, do: :ok = Ecto.Adapters.SQL.Sandbox.checkout(Repo)
     {:ok, nil, {:continue, :calculate_stats}}
   end
 
@@ -32,11 +31,6 @@ defmodule Pleroma.Stats do
     GenServer.call(__MODULE__, :force_update)
   end
 
-  @doc "Performs collect stats"
-  def do_collect do
-    GenServer.cast(__MODULE__, :run_update)
-  end
-
   @doc "Returns stats data"
   @spec get_stats() :: %{
           domain_count: non_neg_integer(),
@@ -111,7 +105,11 @@ defmodule Pleroma.Stats do
   @impl true
   def handle_continue(:calculate_stats, _) do
     stats = calculate_stat_data()
-    Process.send_after(self(), :run_update, @interval)
+
+    unless Pleroma.Config.get(:env) == :test do
+      Process.send_after(self(), :run_update, @interval)
+    end
+
     {:noreply, stats}
   end
 
@@ -127,13 +125,6 @@ defmodule Pleroma.Stats do
   end
 
   @impl true
-  def handle_cast(:run_update, _state) do
-    new_stats = calculate_stat_data()
-
-    {:noreply, new_stats}
-  end
-
-  @impl true
   def handle_info(:run_update, _) do
     new_stats = calculate_stat_data()
     Process.send_after(self(), :run_update, @interval)