X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fapplication.ex;h=1d46925f80b990ec9bab9dee5546c16c8eaf041c;hb=11e12b5761bcd67aa609d91f6f8d1f6755b2312b;hp=3bb0718e40c6e4ada3177587564d0794277c2e13;hpb=51bdf0cab6dc96bfd48a6d98d9f21584b42c0e44;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 3bb0718e4..1d46925f8 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -35,13 +35,13 @@ defmodule Pleroma.Application do
         Pleroma.Emoji,
         Pleroma.Captcha,
         Pleroma.FlakeId,
-        Pleroma.ScheduledActivityWorker
+        Pleroma.ScheduledActivityWorker,
+        Pleroma.ActivityExpirationWorker
       ] ++
         cachex_children() ++
         hackney_pool_children() ++
         [
           Pleroma.Web.Federator.RetryQueue,
-          Pleroma.Web.OAuth.Token.CleanWorker,
           Pleroma.Stats,
           %{
             id: :web_push_init,
@@ -59,6 +59,7 @@ defmodule Pleroma.Application do
             restart: :temporary
           }
         ] ++
+        oauth_cleanup_child(oauth_cleanup_enabled?()) ++
         streamer_child(@env) ++
         chat_child(@env, chat_enabled?()) ++
         [
@@ -115,31 +116,40 @@ defmodule Pleroma.Application do
       build_cachex("object", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
       build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
       build_cachex("scrubber", limit: 2500),
-      build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500)
+      build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500),
+      build_cachex("web_resp", limit: 2500)
     ]
   end
 
   defp idempotency_expiration,
-       do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))
+    do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))
 
   defp seconds_valid_interval,
-       do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
+    do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
 
   defp build_cachex(type, opts),
-       do: %{
-         id: String.to_atom("cachex_" <> type),
-         start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
-         type: :worker
-       }
+    do: %{
+      id: String.to_atom("cachex_" <> type),
+      start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
+      type: :worker
+    }
 
   defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])
 
+  defp oauth_cleanup_enabled?,
+    do: Pleroma.Config.get([:oauth2, :clean_expired_tokens], false)
+
   defp streamer_child(:test), do: []
 
   defp streamer_child(_) do
     [Pleroma.Web.Streamer]
   end
 
+  defp oauth_cleanup_child(true),
+    do: [Pleroma.Web.OAuth.Token.CleanWorker]
+
+  defp oauth_cleanup_child(_), do: []
+
   defp chat_child(:test, _), do: []
 
   defp chat_child(_env, true) do