projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove `:auth, :enforce_oauth_admin_scope_usage`
[akkoma]
/
lib
/
pleroma
/
stats.ex
diff --git
a/lib/pleroma/stats.ex
b/lib/pleroma/stats.ex
index e5c9c668baef9bafc9ee6b1658481cc36faf0af7..b096a9b1e8ea43a0a3fa958eafcaf2a9262829eb 100644
(file)
--- a/
lib/pleroma/stats.ex
+++ b/
lib/pleroma/stats.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Stats do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Stats do
@@
-23,7
+23,6
@@
defmodule Pleroma.Stats do
@impl true
def init(_args) 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
{:ok, nil, {:continue, :calculate_stats}}
end
@@
-32,11
+31,6
@@
defmodule Pleroma.Stats do
GenServer.call(__MODULE__, :force_update)
end
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(),
@doc "Returns stats data"
@spec get_stats() :: %{
domain_count: non_neg_integer(),
@@
-81,7
+75,7
@@
defmodule Pleroma.Stats do
users_query =
from(u in User,
users_query =
from(u in User,
- where: u.
deactivated !
= true,
+ where: u.
is_active =
= true,
where: u.local == true,
where: not is_nil(u.nickname),
where: not u.invisible
where: u.local == true,
where: not is_nil(u.nickname),
where: not u.invisible
@@
-111,7
+105,11
@@
defmodule Pleroma.Stats do
@impl true
def handle_continue(:calculate_stats, _) do
stats = calculate_stat_data()
@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
{:noreply, stats}
end
@@
-126,13
+124,6
@@
defmodule Pleroma.Stats do
{:reply, state, state}
end
{:reply, state, state}
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()
@impl true
def handle_info(:run_update, _) do
new_stats = calculate_stat_data()