moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

don't run  Stats GenServer updates in tests

See merge request pleroma/pleroma!2976
This commit is contained in:
lain 2020-11-04 16:15:04 +00:00
parent d8d4e96230 7bbc328d66
commit 4e7418d963
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/pleroma/stats.ex
View File

@ -23,7 +23,6 @@ def start_link(_) do
@impl true @impl true
def init(_args) do def init(_args) do
if Pleroma.Config.get(:env) == :test, do: :ok = Ecto.Adapters.SQL.Sandbox.checkout(Repo)
{:ok, nil, {:continue, :calculate_stats}} {:ok, nil, {:continue, :calculate_stats}}
end end
@ -32,11 +31,6 @@ def force_update do
GenServer.call(__MODULE__, :force_update) GenServer.call(__MODULE__, :force_update)
end end
@doc "Performs collect stats"
def do_collect do
GenServer.cast(__MODULE__, :run_update)
end
@doc "Returns stats data" @doc "Returns stats data"
@spec get_stats() :: %{ @spec get_stats() :: %{
domain_count: non_neg_integer(), domain_count: non_neg_integer(),
@ -111,7 +105,11 @@ def get_status_visibility_count(instance \\ nil) do
@impl true @impl true
def handle_continue(:calculate_stats, _) do def handle_continue(:calculate_stats, _) do
stats = calculate_stat_data() stats = calculate_stat_data()
unless Pleroma.Config.get(:env) == :test do
Process.send_after(self(), :run_update, @interval) Process.send_after(self(), :run_update, @interval)
end
{:noreply, stats} {:noreply, stats}
end end
@ -126,13 +124,6 @@ def handle_call(:get_state, _from, state) do
{:reply, state, state} {:reply, state, state}
end end
@impl true
def handle_cast(:run_update, _state) do
new_stats = calculate_stat_data()
{:noreply, new_stats}
end
@impl true @impl true
def handle_info(:run_update, _) do def handle_info(:run_update, _) do
new_stats = calculate_stat_data() new_stats = calculate_stat_data()