Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[akkoma] / lib / pleroma / application.ex

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced4c96a8f71f00981f1bb0ddb2b6c83bb..1f0a055681cab7698c8f390d95cfd27ea44fb981 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -14,10 +14,12 @@ defmodule Pleroma.Application do
       supervisor(Pleroma.Web.Endpoint, []),
       # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
       # worker(Pleroma.Worker, [arg1, arg2, arg3]),
-      supervisor(ConCache, [[
-                             ttl_check: :timer.seconds(1),
-                             ttl: :timer.seconds(5)
-                           ], [name: :users]])
+      worker(Cachex, [:user_cache, [
+                         default_ttl: 25000,
+                         ttl_interval: 1000,
+                         limit: 2500
+                       ]]),
+      worker(Pleroma.Web.Federator, [])
     ]
 
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html