a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Move user count to stats agent.

This commit is contained in:
eal 2018-01-14 08:15:11 +02:00
parent 9717166d10
commit d8db39564e
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pleroma/stats.ex
View File

@ -4,13 +4,17 @@ defmodule Pleroma.Stats do
alias Pleroma.{User, Repo, Activity} alias Pleroma.{User, Repo, Activity}
def start_link do def start_link do
agent = Agent.start_link(fn -> %{} end, name: __MODULE__) agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)
schedule_update() schedule_update()
agent agent
end end
def get do def get_stats do
Agent.get(__MODULE__, fn stats -> stats end) Agent.get(__MODULE__, fn {_, stats} -> stats end)
end
def get_peers do
Agent.get(__MODULE__, fn {peers, _} -> peers end)
end end
def schedule_update do def schedule_update do
@ -31,8 +35,9 @@ defmodule Pleroma.Stats do
where: p.local == ^true, where: p.local == ^true,
where: fragment("?->'object'->>'type' = ?", p.data, ^"Note") where: fragment("?->'object'->>'type' = ?", p.data, ^"Note")
status_count = Repo.aggregate(status_query, :count, :id) status_count = Repo.aggregate(status_query, :count, :id)
user_count = Repo.aggregate(User.local_user_query, :count, :id)
Agent.update(__MODULE__, fn _ -> Agent.update(__MODULE__, fn _ ->
%{peers: peers, domain_count: domain_count, status_count: status_count} {peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}
end) end)
end end
end end

11
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -93,8 +93,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
@instance Application.get_env(:pleroma, :instance) @instance Application.get_env(:pleroma, :instance)
def masto_instance(conn, _params) do def masto_instance(conn, _params) do
user_count = Repo.aggregate(User.local_user_query, :count, :id)
%{domain_count: domain_count, status_count: status_count} = Stats.get()
response = %{ response = %{
uri: Web.base_url, uri: Web.base_url,
title: Keyword.get(@instance, :name), title: Keyword.get(@instance, :name),
@ -104,11 +102,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
urls: %{ urls: %{
streaming_api: String.replace(Web.base_url, ["http","https"], "wss") streaming_api: String.replace(Web.base_url, ["http","https"], "wss")
}, },
stats: %{ stats: Stats.get_stats,
status_count: status_count,
user_count: user_count,
domain_count: domain_count
},
max_toot_chars: Keyword.get(@instance, :limit) max_toot_chars: Keyword.get(@instance, :limit)
} }
@ -116,8 +110,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end end
def peers(conn, _params) do def peers(conn, _params) do
%{peers: peers} = Stats.get() json(conn, Stats.get_peers)
json(conn, peers)
end end
defp mastodonized_emoji do defp mastodonized_emoji do