mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Remove :enqueued counter

Browse source
This commit is contained in:
Egor Kislitsyn 2019-10-02 14:50:25 +07:00
parent 75290cbfbd
commit 26693292f4
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
2 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/pleroma/job_queue_monitor.ex
View file

@ -5,9 +5,9 @@
defmodule Pleroma.JobQueueMonitor do defmodule Pleroma.JobQueueMonitor do
use GenServer use GenServer
@initial_state %{workers: %{}, queues: %{}, processed_jobs: 0, enqueued: 0} @initial_state %{workers: %{}, queues: %{}, processed_jobs: 0}
@queue %{processed_jobs: 0, success: 0, failure: 0, enqueued: 0} @queue %{processed_jobs: 0, success: 0, failure: 0}
@operation %{processed_jobs: 0, success: 0, failure: 0, enqueued: 0} @operation %{processed_jobs: 0, success: 0, failure: 0}
def start_link(_) do def start_link(_) do
GenServer.start_link(__MODULE__, @initial_state, name: __MODULE__) GenServer.start_link(__MODULE__, @initial_state, name: __MODULE__)
@ -25,15 +25,6 @@ defmodule Pleroma.JobQueueMonitor do
GenServer.call(__MODULE__, :stats) GenServer.call(__MODULE__, :stats)
end end
def enqueue({:ok, job}) do
meta = Map.take(job, [:args, :queue, :worker])
GenServer.cast(__MODULE__, {:process_enqueue, meta})
{:ok, job}
end
def enqueue(result), do: result
def handle_event([:oban, status], %{duration: duration}, meta, _) do def handle_event([:oban, status], %{duration: duration}, meta, _) do
GenServer.cast(__MODULE__, {:process_event, status, duration, meta}) GenServer.cast(__MODULE__, {:process_event, status, duration, meta})
end end
@ -43,24 +34,6 @@ defmodule Pleroma.JobQueueMonitor do
{:reply, state, state} {:reply, state, state}
end end
def handle_cast({:process_enqueue, meta}, state) do
state =
state
|> Map.update!(:workers, fn workers ->
workers
|> Map.put_new(meta.worker, %{})
|> Map.update!(meta.worker, &update_worker(&1, :enqueue, meta))
end)
|> Map.update!(:queues, fn workers ->
workers
|> Map.put_new(meta.queue, @queue)
|> Map.update!(meta.queue, fn queue -> Map.update!(queue, :enqueued, &(&1 + 1)) end)
end)
|> Map.update!(:enqueued, &(&1 + 1))
{:noreply, state}
end
@impl true @impl true
def handle_cast({:process_event, status, duration, meta}, state) do def handle_cast({:process_event, status, duration, meta}, state) do
state = state =
@ -76,12 +49,11 @@ defmodule Pleroma.JobQueueMonitor do
|> Map.update!(meta.queue, &update_queue(&1, status, meta, duration)) |> Map.update!(meta.queue, &update_queue(&1, status, meta, duration))
end) end)
|> Map.update!(:processed_jobs, &(&1 + 1)) |> Map.update!(:processed_jobs, &(&1 + 1))
|> decr_enqueued()
{:noreply, state} {:noreply, state}
end end
defp update_worker(worker, status, meta, duration \\ 0) do defp update_worker(worker, status, meta, duration) do
worker worker
|> Map.put_new(meta.args["op"], @operation) |> Map.put_new(meta.args["op"], @operation)
|> Map.update!(meta.args["op"], &update_op(&1, status, meta, duration)) |> Map.update!(meta.args["op"], &update_op(&1, status, meta, duration))
@ -96,20 +68,11 @@ defmodule Pleroma.JobQueueMonitor do
op op
|> Map.update!(:processed_jobs, &(&1 + 1)) |> Map.update!(:processed_jobs, &(&1 + 1))
|> Map.update!(status, &(&1 + 1)) |> Map.update!(status, &(&1 + 1))
|> decr_enqueued()
end end
defp update_queue(queue, status, _meta, _duration) do defp update_queue(queue, status, _meta, _duration) do
queue queue
|> Map.update!(:processed_jobs, &(&1 + 1)) |> Map.update!(:processed_jobs, &(&1 + 1))
|> Map.update!(status, &(&1 + 1)) |> Map.update!(status, &(&1 + 1))
|> decr_enqueued()
end
defp decr_enqueued(map) do
Map.update!(map, :enqueued, fn
0 -> 0
enqueued -> enqueued - 1
end)
end end
end end

1
lib/pleroma/workers/worker_helper.ex
View file

@ -40,7 +40,6 @@ defmodule Pleroma.Workers.WorkerHelper do
unquote(caller_module) unquote(caller_module)
|> apply(:new, [params, worker_args]) |> apply(:new, [params, worker_args])
|> Pleroma.Repo.insert() |> Pleroma.Repo.insert()
|> Pleroma.JobQueueMonitor.enqueue()
end end
end end
end end