From 26693292f4b2062504fc9a24e824a6f56cb6b555 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 2 Oct 2019 14:50:25 +0700
Subject: [PATCH] Remove `:enqueued` counter

---
 lib/pleroma/job_queue_monitor.ex     | 45 +++-------------------------
 lib/pleroma/workers/worker_helper.ex |  1 -
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/lib/pleroma/job_queue_monitor.ex b/lib/pleroma/job_queue_monitor.ex
index 685ba2ead..3feea8381 100644
--- a/lib/pleroma/job_queue_monitor.ex
+++ b/lib/pleroma/job_queue_monitor.ex
@@ -5,9 +5,9 @@
 defmodule Pleroma.JobQueueMonitor do
   use GenServer
 
-  @initial_state %{workers: %{}, queues: %{}, processed_jobs: 0, enqueued: 0}
-  @queue %{processed_jobs: 0, success: 0, failure: 0, enqueued: 0}
-  @operation %{processed_jobs: 0, success: 0, failure: 0, enqueued: 0}
+  @initial_state %{workers: %{}, queues: %{}, processed_jobs: 0}
+  @queue %{processed_jobs: 0, success: 0, failure: 0}
+  @operation %{processed_jobs: 0, success: 0, failure: 0}
 
   def start_link(_) do
     GenServer.start_link(__MODULE__, @initial_state, name: __MODULE__)
@@ -25,15 +25,6 @@ defmodule Pleroma.JobQueueMonitor do
     GenServer.call(__MODULE__, :stats)
   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
     GenServer.cast(__MODULE__, {:process_event, status, duration, meta})
   end
@@ -43,24 +34,6 @@ defmodule Pleroma.JobQueueMonitor do
     {:reply, state, state}
   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
   def handle_cast({:process_event, status, duration, meta}, state) do
     state =
@@ -76,12 +49,11 @@ defmodule Pleroma.JobQueueMonitor do
         |> Map.update!(meta.queue, &update_queue(&1, status, meta, duration))
       end)
       |> Map.update!(:processed_jobs, &(&1 + 1))
-      |> decr_enqueued()
 
     {:noreply, state}
   end
 
-  defp update_worker(worker, status, meta, duration \\ 0) do
+  defp update_worker(worker, status, meta, duration) do
     worker
     |> Map.put_new(meta.args["op"], @operation)
     |> Map.update!(meta.args["op"], &update_op(&1, status, meta, duration))
@@ -96,20 +68,11 @@ defmodule Pleroma.JobQueueMonitor do
     op
     |> Map.update!(:processed_jobs, &(&1 + 1))
     |> Map.update!(status, &(&1 + 1))
-    |> decr_enqueued()
   end
 
   defp update_queue(queue, status, _meta, _duration) do
     queue
     |> Map.update!(:processed_jobs, &(&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
diff --git a/lib/pleroma/workers/worker_helper.ex b/lib/pleroma/workers/worker_helper.ex
index a43ce8bc0..358efa14a 100644
--- a/lib/pleroma/workers/worker_helper.ex
+++ b/lib/pleroma/workers/worker_helper.ex
@@ -40,7 +40,6 @@ defmodule Pleroma.Workers.WorkerHelper do
         unquote(caller_module)
         |> apply(:new, [params, worker_args])
         |> Pleroma.Repo.insert()
-        |> Pleroma.JobQueueMonitor.enqueue()
       end
     end
   end
-- 
2.45.2