From 0f722a8c223c1953c9c9fb45e73cc9ace92839e2 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 20 Jan 2018 18:38:30 +0100 Subject: [PATCH] Stats: Make less crashy and improve query. --- lib/pleroma/stats.ex | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex index 938e5c343..0484f1a2d 100644 --- a/lib/pleroma/stats.ex +++ b/lib/pleroma/stats.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Stats do def start_link do agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__) - schedule_update() + spawn(fn -> schedule_update() end) agent end @@ -18,23 +18,22 @@ def get_peers do end def schedule_update do - update_stats() spawn(fn -> Process.sleep(1000 * 60 * 60 * 1) # 1 hour schedule_update() end) + update_stats() end def update_stats do peers = from(u in Pleroma.User, - select: fragment("?->'host'", u.info), + select: fragment("distinct ?->'host'", u.info), where: u.local != ^true) - |> Repo.all() |> Enum.uniq() + |> Repo.all() domain_count = Enum.count(peers) - status_query = from p in Activity, - where: p.local == ^true, - where: fragment("?->'object'->>'type' = ?", p.data, ^"Note") - status_count = Repo.aggregate(status_query, :count, :id) + status_query = from(u in User.local_user_query, + select: fragment("sum((?->>'note_count')::int)", u.info)) + status_count = Repo.one(status_query) |> IO.inspect user_count = Repo.aggregate(User.local_user_query, :count, :id) Agent.update(__MODULE__, fn _ -> {peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}