fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-26 16:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed config/descpiption.exs

Browse source
This commit is contained in:
Maksim Pechnikov 2020-06-24 21:21:33 +03:00
parent 71e233268a
commit cc837f9d15
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/description.exs
View file

@ -1996,18 +1996,11 @@ config :pleroma, :config_description, [
""", """,
children: [ children: [
%{ %{
key: :verbose, key: :log,
type: {:dropdown, :atom}, type: {:dropdown, :atom},
description: "Logs verbose mode", description: "Logs verbose mode",
suggestions: [false, :error, :warn, :info, :debug] 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, key: :queues,
type: {:keyword, :integer}, type: {:keyword, :integer},

14
lib/pleroma/application.ex
View file

@ -80,7 +80,7 @@ defmodule Pleroma.Application do
[ [
Pleroma.Stats, Pleroma.Stats,
Pleroma.JobQueueMonitor, Pleroma.JobQueueMonitor,
{Oban, oban_config()} {Oban, Config.get(Oban)}
] ++ ] ++
task_children(@env) ++ task_children(@env) ++
streamer_child(@env) ++ streamer_child(@env) ++
@ -138,18 +138,6 @@ defmodule Pleroma.Application do
Pleroma.Web.Endpoint.Instrumenter.setup() Pleroma.Web.Endpoint.Instrumenter.setup()
end 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 defp cachex_children do
[ [
build_cachex("used_captcha", ttl_interval: seconds_valid_interval()), build_cachex("used_captcha", ttl_interval: seconds_valid_interval()),