Browse Source

moved Pleroma.Stats to Oban Periodic jobs

floki-fast_html-2-electric-boogalo
Maksim Pechnikov 4 years ago
parent
commit
ac3abb5414
4 changed files with 48 additions and 11 deletions
  1. +2
    -1
      config/config.exs
  2. +29
    -10
      lib/pleroma/stats.ex
  3. +16
    -0
      lib/pleroma/workers/cron/stats_worker.ex
  4. +1
    -0
      test/web/node_info_test.exs

+ 2
- 1
config/config.exs View File

@@ -507,7 +507,8 @@ config :pleroma, Oban,
background: 5
],
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker}
]

config :pleroma, :workers,


+ 29
- 10
lib/pleroma/stats.ex View File

@@ -9,22 +9,43 @@ defmodule Pleroma.Stats do

use GenServer

@interval 1000 * 60 * 60
@init_state %{
peers: [],
stats: %{
domain_count: 0,
status_count: 0,
user_count: 0
}
}

def start_link(_) do
GenServer.start_link(__MODULE__, initial_data(), name: __MODULE__)
GenServer.start_link(
__MODULE__,
@init_state,
name: __MODULE__
)
end

@doc "Performs update stats"
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

@doc "Returns list peers"
@spec get_peers() :: list(String.t())
def get_peers do
%{peers: peers} = GenServer.call(__MODULE__, :get_state)

@@ -32,7 +53,6 @@ defmodule Pleroma.Stats do
end

def init(args) do
Process.send(self(), :run_update, [])
{:ok, args}
end

@@ -45,17 +65,12 @@ defmodule Pleroma.Stats do
{:reply, state, state}
end

def handle_info(:run_update, _state) do
def handle_cast(:run_update, _state) do
new_stats = get_stat_data()

Process.send_after(self(), :run_update, @interval)
{:noreply, new_stats}
end

defp initial_data do
%{peers: [], stats: %{}}
end

defp get_stat_data do
peers =
from(
@@ -74,7 +89,11 @@ defmodule Pleroma.Stats do

%{
peers: peers,
stats: %{domain_count: domain_count, status_count: status_count, user_count: user_count}
stats: %{
domain_count: domain_count,
status_count: status_count,
user_count: user_count
}
}
end
end

+ 16
- 0
lib/pleroma/workers/cron/stats_worker.ex View File

@@ -0,0 +1,16 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only

defmodule Pleroma.Workers.Cron.StatsWorker do
@moduledoc """
The worker to update peers statistics.
"""

use Oban.Worker, queue: "background"

@impl Oban.Worker
def perform(_opts, _job) do
Pleroma.Stats.do_collect()
end
end

+ 1
- 0
test/web/node_info_test.exs View File

@@ -6,6 +6,7 @@ defmodule Pleroma.Web.NodeInfoTest do
use Pleroma.Web.ConnCase

import Pleroma.Factory
clear_config([:mrf_simple])

test "GET /.well-known/nodeinfo", %{conn: conn} do
links =


Loading…
Cancel
Save