projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use indexed split_part/3 to get a hostname rather than ts_ functions
[akkoma]
/
lib
/
pleroma
/
stats.ex
diff --git
a/lib/pleroma/stats.ex
b/lib/pleroma/stats.ex
index a3b8a4d669783e6c19b4a56f78c39e6eb394a1d6..9a03f01db7087d1766599908748a062050b14354 100644
(file)
--- a/
lib/pleroma/stats.ex
+++ b/
lib/pleroma/stats.ex
@@
-1,43
+1,55
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Stats do
import Ecto.Query
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Stats do
import Ecto.Query
+ alias Pleroma.CounterCache
alias Pleroma.Repo
alias Pleroma.User
use GenServer
alias Pleroma.Repo
alias Pleroma.User
use GenServer
- @interval 1000 * 60 * 60
-
def start_link(_) do
def start_link(_) do
- GenServer.start_link(__MODULE__, initial_data(), name: __MODULE__)
+ GenServer.start_link(
+ __MODULE__,
+ nil,
+ name: __MODULE__
+ )
end
end
+ @doc "Performs update stats"
def force_update do
GenServer.call(__MODULE__, :force_update)
end
def force_update 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: integer(), status_count: integer(), user_count: integer()}
def get_stats do
%{stats: stats} = GenServer.call(__MODULE__, :get_state)
stats
end
def get_stats do
%{stats: stats} = GenServer.call(__MODULE__, :get_state)
stats
end
+ @doc "Returns list peers"
+ @spec get_peers() :: list(String.t())
def get_peers do
%{peers: peers} = GenServer.call(__MODULE__, :get_state)
peers
end
def get_peers do
%{peers: peers} = GenServer.call(__MODULE__, :get_state)
peers
end
- def init(args) do
- Process.send_after(self(), :run_update, @interval)
- {:ok, args}
+ def init(_args) do
+ {:ok, calculate_stat_data()}
end
def handle_call(:force_update, _from, _state) do
end
def handle_call(:force_update, _from, _state) do
- new_stats =
get
_stat_data()
+ new_stats =
calculate
_stat_data()
{:reply, new_stats, new_stats}
end
{:reply, new_stats, new_stats}
end
@@
-45,18
+57,13
@@
defmodule Pleroma.Stats do
{:reply, state, state}
end
{:reply, state, state}
end
- def handle_
info
(:run_update, _state) do
- new_stats =
get
_stat_data()
+ def handle_
cast
(:run_update, _state) do
+ new_stats =
calculate
_stat_data()
- Process.send_after(self(), :run_update, @interval)
{:noreply, new_stats}
end
{:noreply, new_stats}
end
- defp initial_data do
- %{peers: [], stats: %{}}
- end
-
- defp get_stat_data do
+ def calculate_stat_data do
peers =
from(
u in User,
peers =
from(
u in User,
@@
-68,18
+75,33
@@
defmodule Pleroma.Stats do
domain_count = Enum.count(peers)
domain_count = Enum.count(peers)
- status_query =
- from(u in User.Query.build(%{local: true}),
- select: fragment("sum((?->>'note_count')::int)", u.info)
- )
+ status_count = Repo.aggregate(User.Query.build(%{local: true}), :sum, :note_count)
- status_count = Repo.one(status_query)
+ users_query =
+ from(u in User,
+ where: u.deactivated != true,
+ where: u.local == true,
+ where: not is_nil(u.nickname),
+ where: not u.invisible
+ )
- user_count = Repo.aggregate(
User.Query.build(%{local: true, active: true})
, :count, :id)
+ user_count = Repo.aggregate(
users_query
, :count, :id)
%{
peers: peers,
%{
peers: peers,
- stats: %{domain_count: domain_count, status_count: status_count, user_count: user_count}
+ stats: %{
+ domain_count: domain_count,
+ status_count: status_count || 0,
+ user_count: user_count
+ }
}
end
}
end
+
+ def get_status_visibility_count(instance \\ nil) do
+ if is_nil(instance) do
+ CounterCache.get_sum()
+ else
+ CounterCache.get_by_instance(instance)
+ end
+ end
end
end