summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-07 16:49:27 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-07 16:49:27 +0000
commitc5434dbefc5e6a25ffb72debe8ed9e09d77bf885 (patch)
tree11980801b18ed17ae5ea31fedb311177454be8bc /config
parent6c6de8e5dfaf245e4e16ddca0c741342eeaa9187 (diff)
parent8c6485c470c1a7cd6ec4b63867d94e9724c4502b (diff)
downloadpleroma-c5434dbefc5e6a25ffb72debe8ed9e09d77bf885.tar.gz
pleroma-c5434dbefc5e6a25ffb72debe8ed9e09d77bf885.zip
Merge branch 'feature/1790-oban-overuse' into 'develop'
removing StatsWorker from Oban cron jobs See merge request pleroma/pleroma!2963
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/description.exs1
2 files changed, 1 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs
index ed37b93c0..d631c3962 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -546,7 +546,6 @@ config :pleroma, Oban,
plugins: [Oban.Plugins.Pruner],
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
- {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
{"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
{"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
@@ -672,7 +671,7 @@ config :pleroma, :static_fe, enabled: false
# With no frontend configuration, the bundled files from the `static` directory will
# be used.
#
-# config :pleroma, :frontends,
+# config :pleroma, :frontends,
# primary: %{"name" => "pleroma-fe", "ref" => "develop"},
# admin: %{"name" => "admin-fe", "ref" => "stable"},
# available: %{...}
diff --git a/config/description.exs b/config/description.exs
index 5e08ba109..18c133f02 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2291,7 +2291,6 @@ config :pleroma, :config_description, [
description: "Settings for cron background jobs",
suggestions: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
- {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
{"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
{"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}