From: Maksim Pechnikov <parallel588@gmail.com>
Date: Wed, 24 Jun 2020 18:21:33 +0000 (+0300)
Subject: fixed config/descpiption.exs
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cc837f9d157f9d43a015a8908f5e2ee178442041;p=akkoma

fixed config/descpiption.exs
---

diff --git a/config/description.exs b/config/description.exs
index f9523936a..ff777391e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1996,18 +1996,11 @@ config :pleroma, :config_description, [
     """,
     children: [
       %{
-        key: :verbose,
+        key: :log,
         type: {:dropdown, :atom},
         description: "Logs verbose mode",
         suggestions: [false, :error, :warn, :info, :debug]
       },
-      %{
-        key: :prune,
-        type: [:atom, :tuple],
-        description:
-          "Non-retryable jobs [pruning settings](https://github.com/sorentwo/oban#pruning)",
-        suggestions: [:disabled, {:maxlen, 1500}, {:maxage, 60 * 60}]
-      },
       %{
         key: :queues,
         type: {:keyword, :integer},
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index fb2731f97..9615af122 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -80,7 +80,7 @@ defmodule Pleroma.Application do
         [
           Pleroma.Stats,
           Pleroma.JobQueueMonitor,
-          {Oban, oban_config()}
+          {Oban, Config.get(Oban)}
         ] ++
         task_children(@env) ++
         streamer_child(@env) ++
@@ -138,18 +138,6 @@ defmodule Pleroma.Application do
     Pleroma.Web.Endpoint.Instrumenter.setup()
   end
 
-  defp oban_config do
-    config = Config.get(Oban)
-
-    if Code.ensure_loaded?(IEx) and IEx.started?() do
-      config
-      |> Keyword.put(:crontab, false)
-      |> Keyword.put(:queues, false)
-    else
-      config
-    end
-  end
-
   defp cachex_children do
     [
       build_cachex("used_captcha", ttl_interval: seconds_valid_interval()),